From c005c31afae432176f8df0adefcc96684a4ef548 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 6 Apr 2016 21:10:04 +0200 Subject: [PATCH] added new option for log file --- transwhat.py | 14 +++++++++----- utils.py | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/transwhat.py b/transwhat.py index 07e36bf..4273ca5 100755 --- a/transwhat.py +++ b/transwhat.py @@ -43,6 +43,7 @@ from yowsup.stacks import YowStack # Arguments parser = argparse.ArgumentParser() parser.add_argument('--debug', action='store_true') +parser.add_argument('--log', type=str) parser.add_argument('--host', type=str, required=True) parser.add_argument('--port', type=int, required=True) parser.add_argument('--service.backend_id', metavar="ID", type=int, required=True) @@ -52,12 +53,15 @@ parser.add_argument('-j', type=str, required=True) args, unknown = parser.parse_known_args() YowConstants.PATH_STORAGE='/var/lib/spectrum2/' + args.j -loggingfile = '/var/log/spectrum2/' + args.j + '/backends/backend.log' + +if args.log is None: + args.log = '/var/log/spectrum2/' + args.j + '/backends/backend.log' + # Logging -logging.basicConfig( \ - filename=loggingfile,\ - format = "%(asctime)-15s %(levelname)s %(name)s: %(message)s", \ - level = logging.DEBUG if args.debug else logging.INFO \ +logging.basicConfig( + filename=args.log, + format = "%(asctime)-15s %(levelname)s %(name)s: %(message)s", + level = logging.DEBUG if args.debug else logging.INFO ) # Handler diff --git a/utils.py b/utils.py index f6d120c..a55546b 100644 --- a/utils.py +++ b/utils.py @@ -50,4 +50,4 @@ def decodePassword(password): return base64.b64decode(bytes(password.encode("utf-8"))) def sha1hash(data): - return hashlib.sha1(data).hexdigest() + return hashlib.sha1(data).hexdigest()