Merge pull request #104 from uabrc/feat-cod-rmq

Merging feat-cod- to feat-prod

prod_rmq_agents/git_commit.py

@@ -6,6 +6,7 @@ import json
 import rc_util
 from rc_rmq import RCRMQ
 import rabbit_config as rmq_cfg
+import time
 
 task = "git_commit"
 
@@ -37,7 +38,8 @@ def git_commit(ch, method, properties, body):
     username = msg["username"]
     msg["task"] = task
     msg["success"] = False
-    branch_name = "issue-add-users-" + username.lower()
+    branch_name = "issue-add-users-" + \
+        username.lower() + "-" + time.strftime("%Y%m%d_%H%M%S")
     user_ldif = users_dir + f"/{username}.ldif"
     group_ldif = groups_dir + f"/{username}.ldif"
 

prod_rmq_agents/notify_user.py

 #!/usr/bin/env python
-import sys
 import json
 import rc_util
 import smtplib
@@ -15,12 +14,13 @@ task = "notify_user"
 args = rc_util.get_args()
 logger = rc_util.get_logger(args)
 
-db = dataset.connect(f"sqlite:///.agent_db/user_reg.db")
+db = dataset.connect(f"sqlite:///{rcfg.db_path}/user_reg.db")
 table = db["users"]
 
 # Instantiate rabbitmq object
 rc_rmq = RCRMQ({"exchange": "RegUsr", "exchange_type": "topic"})
 
+
 # Email instruction to user
 def notify_user(ch, method, properties, body):
     msg = json.loads(body)

prod_rmq_agents/task_manager.py

 #!/usr/bin/env python
-import sys
 import copy
 import json
 import signal
@@ -18,7 +17,7 @@ timeout = 30
 args = rc_util.get_args()
 logger = rc_util.get_logger(args)
 
-db = dataset.connect(f"sqlite:///.agent_db/user_reg.db")
+db = dataset.connect(f"sqlite:///{rcfg.db_path}/user_reg.db")
 table = db["users"]
 
 record = {
@@ -159,9 +158,7 @@ def task_manager(ch, method, properties, body):
 
         if user_db:
             # Restore task status
-            current["request"]["create_account"] = user_db[
-                "create_account"
-            ]
+            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[

prod_rmq_agents/user_reg_logger.py

 #!/usr/bin/env python
 import json
-import sys
 import dataset
 import rc_util
 from rc_rmq import RCRMQ
 from datetime import datetime
+import rabbit_config as rcfg
 
 # Define queue name
 task = "reg_logger"
@@ -19,9 +19,10 @@ args = rc_util.get_args()
 logger = rc_util.get_logger()
 
 # Open registry table in DB
-db = dataset.connect("sqlite:///.agent_db/reg_logger.db")
+db = dataset.connect(f"sqlite:///{rcfg.db_path}/reg_logger.db")
 account_req_table = db["registry"]
 
+
 # Define registration logger callback
 def log_registration(ch, method, properties, body):
 

rabbit_config.py.example

@@ -14,6 +14,7 @@ User_dirs = ['/home', '/data/user', '/data/scratch']
 
 # git_commit agent config
 rc_users_ldap_repo_loc = "~/git/rc-users"
+db_path = ".agent_db"
 
 # Config related to email
 Mail_server = 'localhost'