From cf0f1d1da9b087d7ee40e73e8c1f3c6b7fdf2d38 Mon Sep 17 00:00:00 2001 From: John Dickinson Date: Mon, 2 Dec 2013 11:54:31 -0800 Subject: [PATCH] fixed log formatter issues Change-Id: Ie567b59943029f3ae569576b5c8f1d0942a36a0a --- bin/swift-bench | 6 +++--- bin/swift-bench-client | 6 +++--- swiftbench/bench.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/swift-bench b/bin/swift-bench index b3a22e0..d917360 100755 --- a/bin/swift-bench +++ b/bin/swift-bench @@ -161,7 +161,7 @@ if __name__ == '__main__': sys.exit('Termination signal received.') signal.signal(signal.SIGTERM, sigterm) - logger = logging.getLogger(__name__) + logger = logging.getLogger('swift-bench') logger.propagate = False logger.setLevel({ 'debug': logging.DEBUG, @@ -172,8 +172,8 @@ if __name__ == '__main__': options.log_level.lower(), logging.INFO)) loghandler = logging.StreamHandler() logger.addHandler(loghandler) - logformat = logging.Formatter('%(server)s %(asctime)s %(levelname)s ' - '%(message)s') + logformat = logging.Formatter( + 'swift-bench %(asctime)s %(levelname)s %(message)s') loghandler.setFormatter(logformat) if options.use_proxy: diff --git a/bin/swift-bench-client b/bin/swift-bench-client index 5d3bcb6..4a3d118 100755 --- a/bin/swift-bench-client +++ b/bin/swift-bench-client @@ -34,7 +34,7 @@ if __name__ == '__main__': sys.exit(1) options, args = parser.parse_args() - logger = logging.getLogger() + logger = logging.getLogger('swift-bench-client') logger.setLevel({ 'debug': logging.DEBUG, 'info': logging.INFO, @@ -44,8 +44,8 @@ if __name__ == '__main__': options.log_level.lower(), logging.INFO)) loghandler = logging.StreamHandler() logger.addHandler(loghandler) - logformat = logging.Formatter('%(server)s %(asctime)s %(levelname)s ' - '%(message)s') + logformat = logging.Formatter( + 'swift-bench-client %(asctime)s %(levelname)s %(message)s') loghandler.setFormatter(logformat) def sigterm(signum, frame): diff --git a/swiftbench/bench.py b/swiftbench/bench.py index c1a5314..84449f3 100644 --- a/swiftbench/bench.py +++ b/swiftbench/bench.py @@ -159,7 +159,7 @@ class BenchServer(object): logger.setLevel(level) loghandler = logging.StreamHandler(client_file) logformat = logging.Formatter( - '%(server)s %(asctime)s %(levelname)s %(message)s') + 'bench-server %(asctime)s %(levelname)s %(message)s') loghandler.setFormatter(logformat) logger.addHandler(loghandler) @@ -169,7 +169,7 @@ class BenchServer(object): except socket.error: logger.warning('Socket error', exc_info=1) - logger.logger.removeHandler(loghandler) + logger.removeHandler(loghandler) client_file.close() client.close()