Module: check_mk Branch: master Commit: e66d206195c608c19dbec2b4443bc80a3e0d1a37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e66d206195c608… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Mon Oct 7 01:48:55 2013 +0200 Internal optimization for CMC --- web/htdocs/wato.py | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9db9b9e..c64d8e1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7643,7 +7643,6 @@ def ajax_activation(): # This is the single site activation mode try: start = time.time() - # if not cmc_rush_ahead_activation(): check_mk_local_automation(config.wato_activation_method) duration = time.time() - start update_replication_status(None, {}, { 'act': duration }) @@ -7651,7 +7650,7 @@ def ajax_activation(): if config.debug: import traceback raise MKUserError(None, "Error executing hooks: %s" % - traceback.format_exc().replace('\n', '<br />')) + traceback.format_exc().replace('\n', '<br />')) else: raise @@ -7667,21 +7666,9 @@ def ajax_activation(): # Try to do a rush-ahead-activation def cmc_rush_ahead_activation(): - if defaults.omd_root: - rush_config = defaults.var_dir + "/core/config.rush" - if os.path.exists(rush_config): - try: - rush_id = file(rush_config + ".id").read().strip() - changeid = file(log_dir + "changeid").read().strip() - if rush_id == changeid: # Rush ahead file is up-to-date! - os.rename(rush_config, rush_config[:-5]) - cmc_reload() - log_commit_pending() - html.final_javascript("wato_hide_changes_button();") - return True - except Exception, e: - if config.debug: - raise + return + + def cmc_reload(): log_audit(None, "activate-config", "Reloading Check_MK Micro Core on the fly")