[checkmk-commits] Check_MK Git: check_mk: Conflicts:

Lars Michelsen lm at mathias-kettner.de
Fri Feb 27 09:27:55 CET 2015


Module: check_mk
Branch: master
Commit: 4478698d8059716f20e66d59a80f25924a5dbbe5
URL:    http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4478698d8059716f20e66d59a80f25924a5dbbe5

Author: Lars Michelsen <lm at mathias-kettner.de>
Date:   Fri Feb 27 09:27:50 2015 +0100

Conflicts:
	ChangeLog
	web/htdocs/index.py

---

 .werks/2025         |   10 ++++++++++
 ChangeLog           |    1 +
 web/htdocs/index.py |    4 ++++
 3 files changed, 15 insertions(+)

diff --git a/.werks/2025 b/.werks/2025
new file mode 100644
index 0000000..f3365a5
--- /dev/null
+++ b/.werks/2025
@@ -0,0 +1,10 @@
+Title: Fixed exception when synchronising custom ldap attributes in distributed WATO setup
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1425025584
+
+
diff --git a/ChangeLog b/ChangeLog
index ac71913..2826f2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -290,6 +290,7 @@
     * 2010 FIX: Improved error message when trying to add group assignment rule without having a group configured
     * 1946 FIX: WATO Web-API: edit host action does no longer unset all unspecified attributes...
     * 1223 FIX: Fixed manual configuration of ntp peer check...
+    * 2025 FIX: Fixed exception when synchronising custom ldap attributes in distributed WATO setup
 
     Notifications:
     * 1662 notification plugin spectrum: finalized script. now able to handle host notications
diff --git a/web/htdocs/index.py b/web/htdocs/index.py
index 7d1e857..ac4de43 100644
--- a/web/htdocs/index.py
+++ b/web/htdocs/index.py
@@ -164,6 +164,10 @@ def handler(req, fields = None, profiling = True):
             handler = pagehandlers.get("noauth:" + html.myfile, page_not_found)
             if handler != page_not_found:
                 try:
+                    # Call userdb page hooks which are executed on a regular base to e.g. syncronize
+                    # information withough explicit user triggered actions
+                    userdb.hook_page()
+
                     handler()
                 except Exception, e:
                     html.write(str(e))



More information about the checkmk-commits mailing list