Manually merge v1.4.25 into v2

This commit is contained in:
JonnyWong16 2017-10-02 18:14:46 -07:00
parent 3c04b04b98
commit 37951cd69b
3 changed files with 9 additions and 4 deletions

View file

@ -119,9 +119,9 @@ def main():
plexpy.QUIET = True
if args.nofork:
plexpy.NOFORK = True
logger.info("PlexPy is running as a service, it will not fork when restarted.")
plexpy.NOFORK = True
logger.info("PlexPy is running as a service, it will not fork when restarted.")
if args.pidfile:
plexpy.PIDFILE = str(args.pidfile)