logging can be configured with an INI file

This commit is contained in:
boyska 2016-09-28 12:01:19 +02:00
parent 0840cf51b0
commit fd32e6b438
No known key found for this signature in database
GPG key ID: 7395DCAE58289CA9
2 changed files with 10 additions and 4 deletions

View file

@ -26,6 +26,7 @@ def get_conf(prefix='LARIGIRA_'):
conf['CHECK_SECS'] = 20 # period for checking playlist length
conf['EVENT_TICK_SECS'] = 30 # period for scheduling events
conf['DEBUG'] = False
conf['LOG_CONFIG'] = False
conf.update(from_envvars(prefix=prefix))
return conf

View file

@ -11,6 +11,7 @@ import tempfile
import signal
from time import sleep
import logging
import logging.config
import gevent
from gevent.wsgi import WSGIServer
@ -45,10 +46,14 @@ def main():
'larigira.%d' % os.getuid())
if not os.path.isdir(os.environ['TMPDIR']):
os.makedirs(os.environ['TMPDIR'])
log_format = '%(asctime)s|%(levelname)s[%(name)s:%(lineno)d] %(message)s'
logging.basicConfig(level=logging.DEBUG if get_conf()['DEBUG'] else logging.INFO,
format=log_format,
datefmt='%H:%M:%S')
if get_conf()['LOG_CONFIG']:
logging.config.fileConfig(get_conf()['LOG_CONFIG'],
disable_existing_loggers=True)
else:
log_format = '%(asctime)s|%(levelname)s[%(name)s:%(lineno)d] %(message)s'
logging.basicConfig(level=logging.DEBUG if get_conf()['DEBUG'] else logging.INFO,
format=log_format,
datefmt='%H:%M:%S')
if(get_conf()['MPD_WAIT_START']):
while True:
try: