Merge remote-tracking branch 'origin/development' into updater

This commit is contained in:
Halali 2019-03-09 09:36:30 +01:00
commit 90ae328447
2 changed files with 7 additions and 5 deletions

View file

@ -4,9 +4,12 @@ import os
import logging import logging
import re import re
import types import types
import platform
from logging.handlers import TimedRotatingFileHandler from logging.handlers import TimedRotatingFileHandler
from get_args import args from get_args import args
from config import settings
logger = logging.getLogger() logger = logging.getLogger()
@ -72,6 +75,10 @@ def configure_logging(debug=False):
logging.getLogger("subzero").setLevel(logging.DEBUG) logging.getLogger("subzero").setLevel(logging.DEBUG)
logging.getLogger("git").setLevel(logging.DEBUG) logging.getLogger("git").setLevel(logging.DEBUG)
logging.getLogger("apprise").setLevel(logging.DEBUG) logging.getLogger("apprise").setLevel(logging.DEBUG)
logging.debug('Bazarr version: %s', os.environ["BAZARR_VERSION"])
logging.debug('Bazarr branch: %s', settings.general.branch)
logging.debug('Operating system: %s', platform.platform())
logging.debug('Python version: %s', platform.python_version())
else: else:
logging.getLogger("apscheduler").setLevel(logging.WARNING) logging.getLogger("apscheduler").setLevel(logging.WARNING)
logging.getLogger("subliminal").setLevel(logging.CRITICAL) logging.getLogger("subliminal").setLevel(logging.CRITICAL)

View file

@ -104,11 +104,6 @@ c.execute("UPDATE system SET configured = 0, updated = 0")
conn.commit() conn.commit()
c.close() c.close()
logging.debug('Bazarr version: %s', bazarr_version)
logging.debug('Bazarr branch: %s', settings.general.branch)
logging.debug('Operating system: %s', platform.platform())
logging.debug('Python version: %s', platform.python_version())
# Load languages in database # Load languages in database
load_language_in_db() load_language_in_db()