m26508134
/
docklet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix some errors from merge

This commit is contained in:
zhongyehong 2016-11-17 15:40:58 +08:00
parent 80aaa0f4e2
commit e9403f1c3e
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/monitor.py
View File

@ -48,7 +48,6 @@ c_disk = 4000 # MB
# 6.running indicates the status of worker,and it has two values: True, False. # 6.running indicates the status of worker,and it has two values: True, False.
# 7.containers store the amount of containers on the worker. # 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. # 8.containers store a list which consists of the names of containers on the worker.
>>>>>>> upstream/master
monitor_hosts = {} monitor_hosts = {}
# monitor_vnodes: use the owners' names of vnodes(containers) as first key. # monitor_vnodes: use the owners' names of vnodes(containers) as first key.

1
user/user.py
View File

@ -391,6 +391,7 @@ def beans_admin(cur_user,user,form,issue):
global G_applicationmgr global G_applicationmgr
if issue == 'applymsgs': if issue == 'applymsgs':
result = G_applicationmgr.queryUnRead(cur_user = cur_user) result = G_applicationmgr.queryUnRead(cur_user = cur_user)
logger.debug("applymsg success")
return json.dumps(result) return json.dumps(result)
elif issue == 'agree': elif issue == 'agree':
msgid = form.get("msgid",None) msgid = form.get("msgid",None)