handle clientname parameter

bareos · Sep 19, 2015 · 3d86ae6 · 3d86ae6
1 parent 880c06a
commit 3d86ae6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/bin/bconsole-json.py b/bin/bconsole-json.py
@@ -25,8 +25,18 @@ def getArguments():
         logger.setLevel(logging.DEBUG)
 
     try:
+        options = [ 'address', 'port', 'dirname', 'clientname' ]
+        parameter = {}
+        for i in options:
+            if hasattr(args, i) and getattr(args,i) != None:
+                logger.debug( "%s: %s" %(i, getattr(args,i)))
+                parameter[i] = getattr(args,i)
+            else:
+                logger.debug( '%s: ""' %(i))
+        logger.debug('options: %s' % (parameter))
         password = bareos.bsock.Password(args.password)
-        director = bareos.bsock.BSockJson(address=args.address, dirname=args.dirname, port=args.port, password=password)
+        parameter['password']=password
+        director = bareos.bsock.BSockJson(**parameter)
     except RuntimeError as e:
         print str(e)
         sys.exit(1)

diff --git a/bin/bconsole.py b/bin/bconsole.py
@@ -26,8 +26,18 @@ def getArguments():
         logger.setLevel(logging.DEBUG)
 
     try:
+        options = [ 'address', 'port', 'dirname', 'clientname' ]
+        parameter = {}
+        for i in options:
+            if hasattr(args, i) and getattr(args,i) != None:
+                logger.debug( "%s: %s" %(i, getattr(args,i)))
+                parameter[i] = getattr(args,i)
+            else:
+                logger.debug( '%s: ""' %(i))
+        logger.debug('options: %s' % (parameter))
         password = bareos.bsock.Password(args.password)
-        director = bareos.bsock.BSock(address=args.address, dirname=args.dirname, port=args.port, password=password)
+        parameter['password']=password
+        director = bareos.bsock.BSock(**parameter)
     except RuntimeError as e:
         print str(e)
         sys.exit(1)