github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-20 05:13:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Manually merge v1.4.24 into v2

Browse source
This commit is contained in:
JonnyWong16 2017-10-01 11:19:42 -07:00
commit df4e466fdf
6 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plexpy/__init__.py
View file

@ -58,6 +58,7 @@ VERBOSE = True
DAEMON = False
CREATEPID = False
PIDFILE = None
NOFORK = False
SCHED = BackgroundScheduler()
SCHED_LOCK = threading.Lock()
@ -1195,13 +1196,16 @@ def shutdown(restart=False, update=False, checkout=False):
args += ARGS
if '--nolaunch' not in args:
args += ['--nolaunch']
logger.info(u"Restarting PlexPy with %s", args)
# os.execv fails with spaced names on Windows
# https://bugs.python.org/issue19066
if os.name == 'nt':
if NOFORK:
logger.info('Running as service, not forking. Exiting...')
elif os.name == 'nt':
logger.info('Restarting PlexPy with %s', args)
subprocess.Popen(args, cwd=os.getcwd())
else:
logger.info('Restarting PlexPy with %s', args)
os.execv(exe, args)
os._exit(0)