openstack
/
deb-swift-bench
Code Issues Proposed changes

fixed log formatter issues 

Change-Id: Ie567b59943029f3ae569576b5c8f1d0942a36a0a
This commit is contained in:
John Dickinson 2013-12-02 11:54:31 -08:00
parent b207aaca07
commit cf0f1d1da9
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/swift-bench
View File

@ -161,7 +161,7 @@ if __name__ == '__main__':
sys.exit('Termination signal received.') sys.exit('Termination signal received.')
signal.signal(signal.SIGTERM, sigterm) signal.signal(signal.SIGTERM, sigterm)
logger = logging.getLogger(__name__) logger = logging.getLogger('swift-bench')
logger.propagate = False logger.propagate = False
logger.setLevel({ logger.setLevel({
'debug': logging.DEBUG, 'debug': logging.DEBUG,
@ -172,8 +172,8 @@ if __name__ == '__main__':
options.log_level.lower(), logging.INFO)) options.log_level.lower(), logging.INFO))
loghandler = logging.StreamHandler() loghandler = logging.StreamHandler()
logger.addHandler(loghandler) logger.addHandler(loghandler)
logformat = logging.Formatter('%(server)s %(asctime)s %(levelname)s ' logformat = logging.Formatter(
'%(message)s') 'swift-bench %(asctime)s %(levelname)s %(message)s')
loghandler.setFormatter(logformat) loghandler.setFormatter(logformat)
if options.use_proxy: if options.use_proxy:

6
bin/swift-bench-client
View File

@ -34,7 +34,7 @@ if __name__ == '__main__':
sys.exit(1) sys.exit(1)
options, args = parser.parse_args() options, args = parser.parse_args()
logger = logging.getLogger() logger = logging.getLogger('swift-bench-client')
logger.setLevel({ logger.setLevel({
'debug': logging.DEBUG, 'debug': logging.DEBUG,
'info': logging.INFO, 'info': logging.INFO,
@ -44,8 +44,8 @@ if __name__ == '__main__':
options.log_level.lower(), logging.INFO)) options.log_level.lower(), logging.INFO))
loghandler = logging.StreamHandler() loghandler = logging.StreamHandler()
logger.addHandler(loghandler) logger.addHandler(loghandler)
logformat = logging.Formatter('%(server)s %(asctime)s %(levelname)s ' logformat = logging.Formatter(
'%(message)s') 'swift-bench-client %(asctime)s %(levelname)s %(message)s')
loghandler.setFormatter(logformat) loghandler.setFormatter(logformat)
def sigterm(signum, frame): def sigterm(signum, frame):

4
swiftbench/bench.py
View File

@ -159,7 +159,7 @@ class BenchServer(object):
logger.setLevel(level) logger.setLevel(level)
loghandler = logging.StreamHandler(client_file) loghandler = logging.StreamHandler(client_file)
logformat = logging.Formatter( logformat = logging.Formatter(
'%(server)s %(asctime)s %(levelname)s %(message)s') 'bench-server %(asctime)s %(levelname)s %(message)s')
loghandler.setFormatter(logformat) loghandler.setFormatter(logformat)
logger.addHandler(loghandler) logger.addHandler(loghandler)
@ -169,7 +169,7 @@ class BenchServer(object):
except socket.error: except socket.error:
logger.warning('Socket error', exc_info=1) logger.warning('Socket error', exc_info=1)
logger.logger.removeHandler(loghandler) logger.removeHandler(loghandler)
client_file.close() client_file.close()
client.close() client.close()