Module: check_mk
Branch: master
Commit: 26c76a937228e20db4479986a1db7b8a12540712
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26c76a937228e2…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Jun 21 19:06:53 2017 +0200
4892 FIX Cleanup site changes of deleted sites correctly
When a site was replicated via WATO before and is deleted, the file where
the pending changes of that site were stored was left in the master site.
The path to the file is "var/check_mk/wato/replication_changes_[site].mk".
In case you have files for old sites you can savely delete them.
Change-Id: I98eb375e43300fc5f9551987b4fc703c2f96d0d6
---
.werks/4892 | 15 +++++++++++++++
web/htdocs/watolib.py | 2 ++
2 files changed, 17 insertions(+)
diff --git a/.werks/4892 b/.werks/4892
new file mode 100644
index 0000000..a269ed1
--- /dev/null
+++ b/.werks/4892
@@ -0,0 +1,15 @@
+Title: Cleanup site changes of deleted sites correctly
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.5.0i1
+Date: 1498064706
+
+When a site was replicated via WATO before and is deleted, the file where
+the pending changes of that site were stored was left in the master site.
+
+The path to the file is "var/check_mk/wato/replication_changes_[site].mk".
+In case you have files for old sites you can savely delete them.
diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py
index 40e1c8d..f18b7fe 100644
--- a/web/htdocs/watolib.py
+++ b/web/htdocs/watolib.py
@@ -4042,6 +4042,8 @@ def clear_site_replication_status(site_id):
else:
raise
+ ActivateChanges().confirm_site_changes(site_id)
+
def site_replication_status_path(site_id):
return "%sreplication_status_%s.mk" % (var_dir, site_id)