Skip to content
Snippets Groups Projects
Commit bf60610c authored by Bo-Chun Chen's avatar Bo-Chun Chen
Browse files

Search DB when tracking not hit

If found the user in DB, restore task status
parent 03e0df2d
No related branches found
No related tags found
5 merge requests!147Merge previous default branch feat-cod-rmq into main,!85kill nginx process running under user from login node,!78Feat cod rmq,!62Feat notify user errmsg,!63Feat db handle
...@@ -117,18 +117,31 @@ def task_manager(ch, method, properties, body): ...@@ -117,18 +117,31 @@ def task_manager(ch, method, properties, body):
current = tracking[username] current = tracking[username]
else: else:
user_db = table.find_one(username=username)
current = tracking[username] = copy.deepcopy(record) current = tracking[username] = copy.deepcopy(record)
current['delivery_tags'] = [] current['delivery_tags'] = []
current['errmsg'] = [] current['errmsg'] = []
current['uid'] = msg.get('uid', -1) current['uid'] = user_db['uid'] if user_db else msg['uid']
current['gid'] = msg.get('gid', -1) current['gid'] = user_db['gid'] if user_db else msg['gid']
current['email'] = msg.get('email', '') current['email'] = user_db['email'] if user_db else msg['email']
current['reason'] = msg.get('reason', '') current['reason'] = user_db['reason'] if user_db else msg['reason']
current['fullname'] = msg.get('fullname', '') current['fullname'] = user_db['fullname'] if user_db else msg['fullname']
insert_db(username, msg) if user_db:
# Restore task status
logger.debug(f'Tracking user {username}') current['request']['create_account'] = user_db['create_account']
current['verify']['git_commit'] = user_db['git_commit']
current['verify']['dir_verify'] = user_db['dir_verify']
current['verify']['subscribe_mail_list'] = user_db['subscribe_mail_list']
current['notify']['notify_user'] = user_db['notify_user']
logger.debug(f'Loaded user {username} from DB')
else:
insert_db(username, msg)
logger.debug(f'Tracking user {username}')
# Save the delivery tags for future use # Save the delivery tags for future use
current['delivery_tags'].append(method.delivery_tag) current['delivery_tags'].append(method.delivery_tag)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment