fixed log formatter issues

Change-Id: Ie567b59943029f3ae569576b5c8f1d0942a36a0a

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:

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):

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()