diff --git a/SABnzbd.py b/SABnzbd.py index 854409a..5d29ac3 100755 --- a/SABnzbd.py +++ b/SABnzbd.py @@ -1530,6 +1530,7 @@ def main(): # Check for auto-restart request # Or special restart cases like Mac and WindowsService if sabnzbd.TRIGGER_RESTART: + logging.info("Performing triggered restart") # Shutdown sabnzbd.shutdown_program() @@ -1548,7 +1549,7 @@ def main(): my_name = sabnzbd.MY_FULLNAME.replace("/Contents/MacOS/SABnzbd", "") my_args = " ".join(sys.argv[1:]) cmd = 'kill -9 %s && open "%s" --args %s' % (my_pid, my_name, my_args) - logging.info("Launching: ", cmd) + logging.info("Launching: %s", cmd) os.system(cmd) elif sabnzbd.WIN_SERVICE: # Use external service handler to do the restart diff --git a/sabnzbd/__init__.py b/sabnzbd/__init__.py index e300dd5..02ba00e 100644 --- a/sabnzbd/__init__.py +++ b/sabnzbd/__init__.py @@ -465,15 +465,6 @@ def trigger_restart(timeout=None): if timeout: time.sleep(timeout) - # Add extra arguments - if sabnzbd.downloader.Downloader.do.paused: - sabnzbd.RESTART_ARGS.append("-p") - sys.argv = sabnzbd.RESTART_ARGS - - # Stop all services - sabnzbd.halt() - cherrypy.engine.exit() - if sabnzbd.WIN32: # Remove connection info for faster restart del_connection_info() @@ -482,6 +473,15 @@ def trigger_restart(timeout=None): if hasattr(sys, "frozen"): sabnzbd.TRIGGER_RESTART = True else: + # Add extra arguments + if sabnzbd.downloader.Downloader.do.paused: + sabnzbd.RESTART_ARGS.append("-p") + sys.argv = sabnzbd.RESTART_ARGS + + # Stop all services + sabnzbd.halt() + cherrypy.engine.exit() + # Do the restart right now cherrypy.engine._do_execv()