Utilize rc_util

dir_verify.py

@@ -2,12 +2,16 @@
 import sys
 import json
 import shutil
+import rc_util
 from pathlib import Path
 from rc_rmq import RCRMQ
 
 task = 'dir_verify'
 dirs = ['/home', '/data/user', '/data/scratch']
 
+args = rc_util.get_args()
+logger = rc_util.get_logger(args)
+
 # Instantiate rabbitmq object
 rc_rmq = RCRMQ({'exchange': 'RegUsr', 'exchange_type': 'topic'})
 
@@ -20,16 +24,23 @@ def dir_verify(ch, method, properties, body):
         for d in dirs:
             path = Path(d) / msg['username']
 
-            if not path.exists():
-                # Make sure folder exists and with right permission
-                path.mkdir(mode=0o700)
+            if args.dry_run:
+                logger.info(f'Checking dirs: {path}')
+
+            else:
+                if not path.exists():
+                    # Make sure folder exists and with right permission
+                    path.mkdir(mode=0o700)
+
+                    # Make sure ownership is correct
+                    shutil.chown(path, msg['uid'], msg['gid'])
+
+                    logger.debug(f'{path} created')
 
-                # Make sure ownership is correct
-                shutil.chown(path, msg['uid'], msg['gid'])
         success = True
-    except:
-        e = sys.exc_info()[0]
-        print("[{}]: Error: {}".format(task, e))
+
+    except Exception as exception:
+        logger.error('', exc_info=True)
 
     # send confirm message
     rc_rmq.publish_msg({
@@ -40,12 +51,15 @@ def dir_verify(ch, method, properties, body):
         }
     })
 
+    logger.debug(f'User {username} confirmation sent')
+
 
-print("Start listening to queue: {}".format(task))
+logger.info(f'Start listening to queue: {task}')
 rc_rmq.start_consume({
     'queue': task,
     'routing_key': "verify.*",
     'cb': dir_verify
 })
 
+logger.info('Disconnected')
 rc_rmq.disconnect()