From 2db9d31386ac0478081cfe0b516455d84a2020f8 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Thu, 17 Aug 2017 18:16:28 -0500 Subject: [PATCH] Use shared logic for executing upgrade now that it's part of the handler --- tailbone/views/upgrades.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/tailbone/views/upgrades.py b/tailbone/views/upgrades.py index ca4b9b35..8bacec4b 100644 --- a/tailbone/views/upgrades.py +++ b/tailbone/views/upgrades.py @@ -326,17 +326,9 @@ class UpgradeView(MasterView): def execute_instance(self, upgrade, user, **kwargs): session = orm.object_session(upgrade) - upgrade.executing = True - upgrade.status_code = self.enum.UPGRADE_STATUS_EXECUTING + self.handler.mark_executing(upgrade) session.commit() - result = self.handler.execute(upgrade, user, **kwargs) - upgrade.executing = False - if result: - upgrade.status_code = self.enum.UPGRADE_STATUS_SUCCEEDED - else: - upgrade.status_code = self.enum.UPGRADE_STATUS_FAILED - upgrade.executed = make_utc() - upgrade.executed_by = user + self.handler.do_execute(upgrade, user, **kwargs) def execute_progress(self): upgrade = self.get_instance()