Skip to content
Snippets Groups Projects
Unverified Commit ba3b3c03 authored by Ravi Tripathi's avatar Ravi Tripathi Committed by GitHub
Browse files

Merge pull request #103 from diedpigs/feat-var-db-path

Feat var db path
parents c776a1d8 0b235df4
No related branches found
No related tags found
No related merge requests found
#!/usr/bin/env python #!/usr/bin/env python
import sys
import json import json
import rc_util import rc_util
import smtplib import smtplib
...@@ -15,12 +14,13 @@ task = "notify_user" ...@@ -15,12 +14,13 @@ task = "notify_user"
args = rc_util.get_args() args = rc_util.get_args()
logger = rc_util.get_logger(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"] table = db["users"]
# Instantiate rabbitmq object # Instantiate rabbitmq object
rc_rmq = RCRMQ({"exchange": "RegUsr", "exchange_type": "topic"}) rc_rmq = RCRMQ({"exchange": "RegUsr", "exchange_type": "topic"})
# Email instruction to user # Email instruction to user
def notify_user(ch, method, properties, body): def notify_user(ch, method, properties, body):
msg = json.loads(body) msg = json.loads(body)
......
#!/usr/bin/env python #!/usr/bin/env python
import sys
import copy import copy
import json import json
import signal import signal
...@@ -18,7 +17,7 @@ timeout = 30 ...@@ -18,7 +17,7 @@ timeout = 30
args = rc_util.get_args() args = rc_util.get_args()
logger = rc_util.get_logger(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"] table = db["users"]
record = { record = {
...@@ -159,9 +158,7 @@ def task_manager(ch, method, properties, body): ...@@ -159,9 +158,7 @@ def task_manager(ch, method, properties, body):
if user_db: if user_db:
# Restore task status # Restore task status
current["request"]["create_account"] = user_db[ current["request"]["create_account"] = user_db["create_account"]
"create_account"
]
current["verify"]["git_commit"] = user_db["git_commit"] current["verify"]["git_commit"] = user_db["git_commit"]
current["verify"]["dir_verify"] = user_db["dir_verify"] current["verify"]["dir_verify"] = user_db["dir_verify"]
current["verify"]["subscribe_mail_list"] = user_db[ current["verify"]["subscribe_mail_list"] = user_db[
......
#!/usr/bin/env python #!/usr/bin/env python
import json import json
import sys
import dataset import dataset
import rc_util import rc_util
from rc_rmq import RCRMQ from rc_rmq import RCRMQ
from datetime import datetime from datetime import datetime
import rabbit_config as rcfg
# Define queue name # Define queue name
task = "reg_logger" task = "reg_logger"
...@@ -19,9 +19,10 @@ args = rc_util.get_args() ...@@ -19,9 +19,10 @@ args = rc_util.get_args()
logger = rc_util.get_logger() logger = rc_util.get_logger()
# Open registry table in DB # 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"] account_req_table = db["registry"]
# Define registration logger callback # Define registration logger callback
def log_registration(ch, method, properties, body): def log_registration(ch, method, properties, body):
......
...@@ -14,6 +14,7 @@ User_dirs = ['/home', '/data/user', '/data/scratch'] ...@@ -14,6 +14,7 @@ User_dirs = ['/home', '/data/user', '/data/scratch']
# git_commit agent config # git_commit agent config
rc_users_ldap_repo_loc = "~/git/rc-users" rc_users_ldap_repo_loc = "~/git/rc-users"
db_path = ".agent_db"
# Config related to email # Config related to email
Mail_server = 'localhost' Mail_server = 'localhost'
......
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