Commit 192bbe2e authored by Nicolas Wavrant's avatar Nicolas Wavrant

erp5_upgrader: call Alarm_postFullUpgradeNeed only when all other activities finished

parent b9c2f1f0
...@@ -24,7 +24,7 @@ portal_alarms.upgrader_check_pre_upgrade.activeSense( ...@@ -24,7 +24,7 @@ portal_alarms.upgrader_check_pre_upgrade.activeSense(
params={'tag': pre_upgrade_tag}, params={'tag': pre_upgrade_tag},
) )
portal_alarms.upgrader_check_upgrader.activeSense( notify_tag = portal_alarms.upgrader_check_upgrader.activeSense(
fixit=fixit, fixit=fixit,
activate_kw={ activate_kw={
'activity': 'SQLQueue', 'activity': 'SQLQueue',
...@@ -39,7 +39,7 @@ portal_alarms.upgrader_check_upgrader.activeSense( ...@@ -39,7 +39,7 @@ portal_alarms.upgrader_check_upgrader.activeSense(
# what are *currently* installed, and not on the result of the previous # what are *currently* installed, and not on the result of the previous
# steps, which lead to a wrong and misleading consistency check # steps, which lead to a wrong and misleading consistency check
if fixit: if fixit:
portal_alarms.upgrader_check_post_upgrade.activeSense( notify_tag = portal_alarms.upgrader_check_post_upgrade.activeSense(
fixit=fixit, fixit=fixit,
activate_kw={ activate_kw={
'activity': 'SQLQueue', 'activity': 'SQLQueue',
...@@ -61,7 +61,7 @@ else: ...@@ -61,7 +61,7 @@ else:
# start another activity to collect the results from each upgrader step # start another activity to collect the results from each upgrader step
context.activate(after_tag=(upgrade_tag, post_upgrade_tag)).Alarm_postFullUpgradeNeed( context.activate(after_tag=(upgrade_tag, post_upgrade_tag, notify_tag)).Alarm_postFullUpgradeNeed(
active_process=active_process.getRelativeUrl()) active_process=active_process.getRelativeUrl())
# Nothing else to do, so we can disable. # Nothing else to do, so we can disable.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment