Merge branch 'nightly' into python3

# Conflicts:
#	plexpy/webserve.py
This commit is contained in:
JonnyWong16 2020-01-20 20:55:30 -08:00
commit b39ac866f2
12 changed files with 23 additions and 16 deletions

View file

@ -104,8 +104,8 @@ def main():
plexpy.QUIET = True
# Do an intial setup of the logger.
logger.initLogger(console=not plexpy.QUIET, log_dir=False,
verbose=plexpy.VERBOSE)
# Require verbose for pre-initilization to see critical errors
logger.initLogger(console=not plexpy.QUIET, log_dir=False, verbose=True)
try:
plexpy.SYS_TIMEZONE = tzlocal.get_localzone()