Module: check_mk
Branch: master
Commit: 56edfc200d4d485789095db2a156fd97693dbdb1
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56edfc200d4d48…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Jan 25 10:21:36 2013 +0100
fixed bug: removing pending log in distr. setup
---
ChangeLog | 1 +
web/htdocs/wato.py | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9772273..81e2cd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@
* FIX: Fixed problem on user profile page when no alias set for a user
* FIX: list valuespecs could not be extended after once saving
* FIX: fix title of foldable areas contained in list valuespecs
+ * FIX: Fixed bug where pending log was not removed in multisite setup
1.2.1i5:
Core:
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index f5da593..fd309f9 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -6677,11 +6677,11 @@ def mode_edit_site(phase):
save_sites(sites)
- # Own site needs SYNCRESTART in any case
+ # Own site needs RESTART in any case
update_replication_status(our_site_id(), { "need_restart" : True })
-
if new:
- update_replication_status(id, { "need_sync" : True,
"need_restart" : True })
+ if not site_is_local(id):
+ update_replication_status(id, { "need_sync" : True,
"need_restart" : True })
log_pending(AFFECTED, None, "edit-sites", _("Created new
connection to site %s" % id))
else:
log_pending(AFFECTED, None, "edit-sites", _("Modified site
connection %s" % id))