Private GIT

Skip to content
Snippets Groups Projects
Commit 9f3e3b8c authored by Alexandre Beloin's avatar Alexandre Beloin
Browse files

Merge branch 'develop'

parents 3b399f16 1ec2c573
Branches
Tags v4.0.12
No related merge requests found
Showing
with 5 additions and 3 deletions
...@@ -110,9 +110,9 @@ class SickRage(object): ...@@ -110,9 +110,9 @@ class SickRage(object):
help_msg += " -q --quiet Disables logging to console\n" help_msg += " -q --quiet Disables logging to console\n"
help_msg += " --nolaunch Suppress launching web browser on startup\n" help_msg += " --nolaunch Suppress launching web browser on startup\n"
if sys.platform == 'win32': if sys.platform == 'win32' or sys.platform == 'darwin':
help_msg += " -d --daemon Running as real daemon is not supported on Windows\n" help_msg += " -d --daemon Running as real daemon is not supported on Windows\n"
help_msg += " On Windows, --daemon is substituted with: --quiet --nolaunch\n" help_msg += " On Windows and MAC, --daemon is substituted with: --quiet --nolaunch\n"
else: else:
help_msg += " -d --daemon Run as double forked daemon (includes options --quiet --nolaunch)\n" help_msg += " -d --daemon Run as double forked daemon (includes options --quiet --nolaunch)\n"
help_msg += " --pidfile=<path> Combined with --daemon creates a pidfile (full path including filename)\n" help_msg += " --pidfile=<path> Combined with --daemon creates a pidfile (full path including filename)\n"
...@@ -208,7 +208,7 @@ class SickRage(object): ...@@ -208,7 +208,7 @@ class SickRage(object):
self.consoleLogging = False self.consoleLogging = False
self.noLaunch = True self.noLaunch = True
if sys.platform == 'win32': if sys.platform == 'win32' or sys.platform == 'darwin':
self.runAsDaemon = False self.runAsDaemon = False
# Write a pidfile if requested # Write a pidfile if requested
...@@ -521,9 +521,11 @@ class SickRage(object): ...@@ -521,9 +521,11 @@ class SickRage(object):
if '--nolaunch' not in popen_list: if '--nolaunch' not in popen_list:
popen_list += ['--nolaunch'] popen_list += ['--nolaunch']
logger.log(u"Restarting SickRage with " + str(popen_list)) logger.log(u"Restarting SickRage with " + str(popen_list))
logger.shutdown() #shutdown the logger to make sure it's released the logfile BEFORE it restarts SR.
subprocess.Popen(popen_list, cwd=os.getcwd()) subprocess.Popen(popen_list, cwd=os.getcwd())
# system exit # system exit
logger.shutdown() #Make sure the logger has stopped, just in case
os._exit(0) os._exit(0)
......
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment