Changeset 897

Timestamp:

12/29/05 18:03:29

Author:

fumanchu

Message:

Fix for #413 (Improve configuration error behavior).

Files:

• trunk/cherrypy/_cperror.py (modified) (1 diff)
• trunk/cherrypy/_cpserver.py (modified) (2 diffs)
• trunk/cherrypy/test/test_states.py (modified) (1 diff)

trunk/cherrypy/_cperror.py

@@ -11 +11 @@
-
-class WrongConfigValue(Error):
-unrepr can't parse a config value
+a config value can't be parsed, or is otherwise illegal.
-    pass
-

trunk/cherrypy/_cpserver.py

@@ -64 +64 @@
-        self.blocking = not initOnly
-        self.httpserverclass = serverClass
+        
+        # Hmmm...we *could* check config in _start instead, but I think
+        # most people would like CP to fail before autoreload kicks in.
+        check_config()
-        
-        # Autoreload, but check serverClass. If None, we're not starting
@@ -269 +273 @@
-
-
+def check_config():
+    err = cherrypy.WrongConfigValue
+    for name, section in cherrypy.config.configs.iteritems():
+        for k, v in section.iteritems():
+            if k == "server.environment":
+                if v and v not in cherrypy.config.environments:
+                    raise err("'%s' is not a registered environment." % v)
+
+
-def configure():
-    """Perform one-time actions to prepare the CherryPy core."""

trunk/cherrypy/test/test_states.py

@@ -163 +163 @@
-            self.assertEqual(db_connection.running, False)
-            self.assertEqual(len(db_connection.threads), 0)
+    
+    def test_3_ConfigErrors(self):
+        cherrypy.config.update({'server.environment': 'destruction'})
+        try:
+            self.assertRaises(cherrypy.WrongConfigValue,
+                              cherrypy.server.start, True, self.serverClass)
+        finally:
+            cherrypy.server.stop()
-
-