From 8361b137ccfacfcf3fbd318c23977e5b7b1f3de8 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Wed, 5 May 2010 19:21:47 +0200 Subject: [PATCH] Rename debug option to dump --- mopidy/__main__.py | 10 +++++----- mopidy/settings.py | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mopidy/__main__.py b/mopidy/__main__.py index 0769d6b6..a99d9ddc 100644 --- a/mopidy/__main__.py +++ b/mopidy/__main__.py @@ -33,9 +33,9 @@ def _parse_options(): parser.add_option('-v', '--verbose', action='store_const', const=2, dest='verbosity_level', help='more output (debug level)') - parser.add_option('-d', '--debug', - action='store_true', dest='debug', - help='debug logging to file') + parser.add_option('--dump', + action='store_true', dest='dump', + help='dump debug log to file') return parser.parse_args()[0] def _setup_logging(verbosity_level, debug): @@ -54,10 +54,10 @@ def _setup_logging(verbosity_level, debug): root = logging.getLogger('') root.setLevel(logging.DEBUG) - formatter = logging.Formatter(settings.DEBUG_LOG_FORMAT) + formatter = logging.Formatter(settings.DUMP_LOG_FORMAT) handler = logging.handlers.RotatingFileHandler( - settings.DEBUG_LOG_FILENAME, maxBytes=102400, backupCount=3) + settings.DUMP_LOG_FILENAME, maxBytes=102400, backupCount=3) handler.setFormatter(formatter) root.addHandler(handler) diff --git a/mopidy/settings.py b/mopidy/settings.py index 470bf2a2..6375568a 100644 --- a/mopidy/settings.py +++ b/mopidy/settings.py @@ -29,11 +29,11 @@ BACKENDS = ( CONSOLE_LOG_FORMAT = u'%(levelname)-8s %(asctime)s' + \ ' [%(process)d:%(threadName)s] %(name)s\n %(message)s' -#: The log format used for debug log dumps. -DEBUG_LOG_FORMAT = u'%(asctime)s - %(levelname)-5s - %(name)s - %(message)s' +#: The log format used for dump logs. +DUMP_LOG_FORMAT = CONSOLE_LOG_FORMAT -#: The file to log debug data to. -DEBUG_LOG_FILENAME = u'debug.log' +#: The file to dump debug log data to. +DUMP_LOG_FILENAME = u'dump.log' #: Protocol frontend to use. Default:: #: