Module: check_mk
Branch: master
Commit: 5af5486d51cc6760ef092c8946a5fc9aa0a02199
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5af5486d51cc67…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Feb 7 14:09:43 2013 +0100
FIX: Do not execute ldap sync while performing actions on users page
---
ChangeLog | 1 +
web/htdocs/wato.py | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 533974d..9bfbe10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,6 +62,7 @@
* FIX: Fixed synchronisation of mkeventd configs in distributed WATO setups
* FIX: "Sync & Restart" did not perform restart in distributed WATO
setups
* FIX: Fixed exception in editing code of ldap group to rule plugin
+ * FIX: Don't execute ldap sync while performing actions on users page
Event Console:
* Added UNIX socket for sending events to the EC
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 491a1a2..91d46d3 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -7714,8 +7714,10 @@ def mode_users(phase):
return
# Execute all connectors synchronisations of users. This must be done before
- # loading the users, because it might modify the users list
- userdb.hook_sync(add_to_changelog = True)
+ # loading the users, because it might modify the users list. But don't execute
+ # it during actions, this should save some time.
+ if phase != "action":
+ userdb.hook_sync(add_to_changelog = True)
roles = userdb.load_roles()
users = filter_hidden_users(userdb.load_users())