andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'feature/less-verbose-logging' into develop

Browse Source
This commit is contained in:
Thomas Adamcik 2011-07-24 16:22:42 +02:00
commit 2a0646cc43
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mopidy/core.py
View File

@ -71,7 +71,7 @@ def parse_options():
action='store_const', const=0, dest='verbosity_level', action='store_const', const=0, dest='verbosity_level',
help='less output (warning level)') help='less output (warning level)')
parser.add_option('-v', '--verbose', parser.add_option('-v', '--verbose',
action='store_const', const=2, dest='verbosity_level', action='count', default=1, dest='verbosity_level',
help='more output (debug level)') help='more output (debug level)')
parser.add_option('--save-debug-log', parser.add_option('--save-debug-log',
action='store_true', dest='save_debug_log', action='store_true', dest='save_debug_log',

5
mopidy/utils/log.py
View File

@ -20,7 +20,7 @@ def setup_console_logging(verbosity_level):
if verbosity_level == 0: if verbosity_level == 0:
log_level = logging.WARNING log_level = logging.WARNING
log_format = settings.CONSOLE_LOG_FORMAT log_format = settings.CONSOLE_LOG_FORMAT
elif verbosity_level == 2: elif verbosity_level >= 2:
log_level = logging.DEBUG log_level = logging.DEBUG
log_format = settings.DEBUG_LOG_FORMAT log_format = settings.DEBUG_LOG_FORMAT
else: else:
@ -33,6 +33,9 @@ def setup_console_logging(verbosity_level):
root = logging.getLogger('') root = logging.getLogger('')
root.addHandler(handler) root.addHandler(handler)
if verbosity_level < 3:
logging.getLogger('pykka').setLevel(logging.INFO)
def setup_debug_logging_to_file(): def setup_debug_logging_to_file():
formatter = logging.Formatter(settings.DEBUG_LOG_FORMAT) formatter = logging.Formatter(settings.DEBUG_LOG_FORMAT)
handler = logging.handlers.RotatingFileHandler( handler = logging.handlers.RotatingFileHandler(