[checkmk-commits] Dropped pre 1.4.0i3 compatibility code

Module: check_mk Branch: master Commit: c2470545182421e43341fce6937f9a2d54b2e6e7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2470545182421… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Sun Feb 24 17:48:36 2019 +0100 Dropped pre 1.4.0i3 compatibility code Change-Id: I3259ff9ba2b4880133ecc88be0fe1ebfca088a28 --- cmk/gui/watolib/activate_changes.py | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/cmk/gui/watolib/activate_changes.py b/cmk/gui/watolib/activate_changes.py index b67abb4..e00926e 100644 --- a/cmk/gui/watolib/activate_changes.py +++ b/cmk/gui/watolib/activate_changes.py @@ -28,7 +28,6 @@ import os import shutil import time import multiprocessing -import six import cmk.utils import cmk.utils.daemon as daemon @@ -1058,44 +1057,13 @@ class ActivateChangesSite(multiprocessing.Process, ActivateChanges): ]) except cmk.gui.watolib.automations.MKAutomationException as e: if "Invalid automation command: activate-changes" in "%s" % e: - return self._call_legacy_activate_changes_automation() + raise MKGeneralException( + "Activate changes failed (%s). The version of this site may be too old.") else: raise return response - # This is needed to be able to activate the changes on legacy (pre 1.4.0i3) slave sites. - # Sadly this is only possible by syncing the snapshot a second time. - def _call_legacy_activate_changes_automation(self): - site = config.site(self._site_id) - - url = html.makeuri_contextless( - [ - ("command", "push-snapshot"), - ("secret", site["secret"]), - ("siteid", site["id"]), - ("mode", "slave"), - ("restart", "yes"), - ("debug", config.debug and "1" or ""), - ], - filename=site["multisiteurl"] + "automation.py", - ) - - response_text = self._upload_file(url, site.get('insecure', False)) - - try: - cmk_configuration_warnings = ast.literal_eval(response_text) - - # In case of an exception it returns a str/unicode message. Wrap the - # message in a list to be compatible to regular response - if isinstance(cmk_configuration_warnings, six.string_types): - cmk_configuration_warnings = [cmk_configuration_warnings] - - return {"check_mk": cmk_configuration_warnings} - except: - raise cmk.gui.watolib.automations.MKAutomationException( - _("Garbled automation response from site %s: '%s'") % (site["id"], response_text)) - def _get_domains_needing_activation(self): domains = set([]) for change in self._site_changes: