[checkmk-commits] added WK6690

Module: check_mk Branch: master Commit: 41cc76879bb8a7af06d86414d4f2dfb93b012020 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41cc76879bb8a7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Nov 21 13:41:07 2018 +0100 added WK6690 Change-Id: Ib6cdf8667a5bfab63ea5def48036abab42b8133f --- .werks/6690 | 11 +++++++++++ cmk/gui/userdb.py | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/6690 b/.werks/6690 new file mode 100644 index 0000000..0042a41 --- /dev/null +++ b/.werks/6690 @@ -0,0 +1,11 @@ +Title: Fixed timeout during user logins when user synchronisation background job was running +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1542803194 + + diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py index 3484223..692f07f 100644 --- a/cmk/gui/userdb.py +++ b/cmk/gui/userdb.py @@ -208,10 +208,10 @@ def new_user_template(connection_id): def create_non_existing_user(connection_id, username): - users = load_users(lock=True) - if username in users: + if user_exists(username): return # User exists. Nothing to do... + users = load_users(lock=True) users[username] = new_user_template(connection_id) save_users(users)