Fix bug with --production where production settings weren't used.
From http://docs.cherrypy.org/dev/intro/concepts/config.html
production should be set using cherrypy.config.update before creating
sub-configs.
BUG=chromium-os:32450
TEST=Verified auto-reload did not happen with --production
Change-Id: I5c9266352d56cd29cae186ee69161ee9009e2dec
Reviewed-on: https://gerrit.chromium.org/gerrit/27068
Tested-by: Chris Sosa <sosa@chromium.org>
Reviewed-by: Scott Zawalski <scottz@chromium.org>
Commit-Ready: Chris Sosa <sosa@chromium.org>
diff --git a/devserver.py b/devserver.py
index 60b5b9b..5095f48 100755
--- a/devserver.py
+++ b/devserver.py
@@ -111,9 +111,6 @@
base_config['global']['log.error_file'] = os.path.join(
options.log_dir, 'devserver_error.log')
- if options.production:
- base_config['global']['server.environment'] = 'production'
-
return base_config
@@ -584,6 +581,10 @@
# If the command line requested after setup, it's time to do it.
if not options.exit:
+ if options.production:
+ cherrypy.config.update({'environment': 'production',
+ 'log.screen': True})
+
cherrypy.quickstart(DevServerRoot(), config=_GetConfig(options))