Optimized runner script

couchpotato/runner.py

@@ -11,7 +11,6 @@ import logging
 import os.path
 import sys
 import time
-import traceback
 
 def getOptions(base_path, args):
 
@@ -95,15 +94,21 @@ def runCouchPotato(options, base_path, args, desktop = None):
     debug = options.debug or Env.setting('debug', default = False, type = 'bool')
     Env.set('debug', debug)
 
-    if not Env.setting('development'):
+    # Development
+    development = Env.setting('development', default = False, type = 'bool')
+    Env.set('dev', development)
+    if not development:
         atexit.register(cleanup)
 
+    # Use reloader
+    reloader = debug is True and development and not Env.get('desktop') and not options.daemon
+
     # Disable server access log
     logging.getLogger('werkzeug').setLevel(logging.WARNING)
 
     # Only run once when debugging
     fire_load = False
-    if os.environ.get('WERKZEUG_RUN_MAIN') or not debug or Env.get('desktop') or options.daemon:
+    if os.environ.get('WERKZEUG_RUN_MAIN') or not reloader:
 
         # Logger
         logger = logging.getLogger()
@@ -168,7 +173,6 @@ def runCouchPotato(options, base_path, args, desktop = None):
     from couchpotato import app
     api_key = Env.setting('api_key')
     url_base = '/' + Env.setting('url_base').lstrip('/') if Env.setting('url_base') else ''
-    reloader = debug is True and Env.setting('development') and not Env.get('desktop') and not options.daemon
 
     # Basic config
     app.secret_key = api_key
@@ -194,10 +198,4 @@ def runCouchPotato(options, base_path, args, desktop = None):
     if fire_load: fireEventAsync('app.load')
 
     # Go go go!
-    try:
-        app.run(**config)
-    except (KeyboardInterrupt, SystemExit):
-        raise
-    except:
-        log.error('Failed starting: %s' % traceback.format_exc())
-        raise
+    app.run(**config)