From e9403f1c3ef68efaca81e7ce36c5c2d08d517e3a Mon Sep 17 00:00:00 2001 From: zhongyehong Date: Thu, 17 Nov 2016 15:40:58 +0800 Subject: [PATCH] fix some errors from merge --- src/monitor.py | 1 - user/user.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/monitor.py b/src/monitor.py index 6426821..fa8ca3f 100755 --- a/src/monitor.py +++ b/src/monitor.py @@ -48,7 +48,6 @@ c_disk = 4000 # MB # 6.running indicates the status of worker,and it has two values: True, False. # 7.containers store the amount of containers on the worker. # 8.containers store a list which consists of the names of containers on the worker. ->>>>>>> upstream/master monitor_hosts = {} # monitor_vnodes: use the owners' names of vnodes(containers) as first key. diff --git a/user/user.py b/user/user.py index c17abf1..20d2166 100755 --- a/user/user.py +++ b/user/user.py @@ -391,6 +391,7 @@ def beans_admin(cur_user,user,form,issue): global G_applicationmgr if issue == 'applymsgs': result = G_applicationmgr.queryUnRead(cur_user = cur_user) + logger.debug("applymsg success") return json.dumps(result) elif issue == 'agree': msgid = form.get("msgid",None)