From ced317741d34bb91c59565063e5c81005219aa2f Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Sun, 12 Apr 2020 07:01:36 +0000
Subject: [PATCH] Add logging and dry-run functionality to
bright-account-create agent
---
brightcm_account_create.py | 39 +++++++++++++++++++++++++++++++-------
1 file changed, 32 insertions(+), 7 deletions(-)
diff --git a/brightcm_account_create.py b/brightcm_account_create.py
index a209aa3..2e68459 100644
--- a/brightcm_account_create.py
+++ b/brightcm_account_create.py
@@ -1,6 +1,8 @@
#!/usr/bin/env python
import sys
import json
+import logging
+import argparse
from os import popen
from rc_rmq import RCRMQ
@@ -9,11 +11,29 @@ task = 'bright_account'
# Instantiate rabbitmq object
rc_rmq = RCRMQ({'exchange': 'RegUsr', 'exchange_type': 'topic'})
+# Parse arguments
+parser = argparse.ArgumentParser()
+parser.add_argument('-v', '--verbose', action='store_true', help='verbose output')
+parser.add_argument('-n', '--dry-run', action='store_true', help='enable dry run mode')
+args = parser.parse_args()
+
+#Default Log level
+log_lvl = logging.WARNING
+
+if args.verbose:
+ log_lvl = logging.DEBUG
+if args.dry_run:
+ log_lvl = logging.INFO
+
+# Logger
+logging.basicConfig(format='%(asctime)s %(levelname)s [%(module)s] - %(message)s', level=log_lvl)
+logger = logging.getLogger(__name__)
+
# Define your callback function
def bright_account_create(ch, method, properties, body):
# Retrieve message
msg = json.loads(body)
- print("Received msg{}".format(msg))
+ logger.info("Received {}".format(msg))
username = msg['username']
uid = msg['uid']
email = msg['email']
@@ -25,17 +45,18 @@ def bright_account_create(ch, method, properties, body):
cmd += f'"user; add {username}; set userid {uid}; set email {email}; set commonname \\"{fullname}\\"; '
cmd += 'commit;"'
- #popen(cmd)
- print(cmd)
+ if not args.dry_run:
+ popen(cmd)
+ logger.info(f'Bright command to create user:{cmd}')
success = True
- except:
- e = sys.exc_info()[0]
- print("[{}]: Error: {}".format(task, e))
+ except Exception:
+ logger.exception("Fatal error:")
# Acknowledge message
ch.basic_ack(delivery_tag=method.delivery_tag)
# send confirm message
+ logger.debug('rc_rmq.publish_msg()')
rc_rmq.publish_msg({
'routing_key': 'confirm.' + username,
'msg': {
@@ -43,19 +64,23 @@ def bright_account_create(ch, method, properties, body):
'success': success
}
})
+ logger.info('confirmation sent')
if success:
# send create message to verify dir permissions agent
+ logger.debug(f'The task {task} finished successfully')
rc_rmq.publish_msg({
'routing_key': 'verify.' + username,
'msg': msg
})
+ logger.info('verify msg sent to next agent')
-print("Start listening to queue: {}".format(task))
+logger.info("Start listening to queue: {}".format(task))
rc_rmq.start_consume({
'queue': task,
'routing_key': "create.*",
'cb': bright_account_create
})
+logger.info("Disconnected")
rc_rmq.disconnect()
--
GitLab