Changeset 1004

Timestamp:

03/10/06 06:39:46

Author:

dowski

Message:

Addresses #480.

init_only can now be set in the config (server.init_only). server.class already existed. server.instance can also be set in the config. It corresponds to the "server" parameter in the cherrypy.server.start() method.

Also added "embedded" server environment to simplify running CP embedded in mod_python, FastCGI, another WSGI server, etc.

Files:

• trunk/cherrypy/_cpserver.py (modified) (2 diffs)
• trunk/cherrypy/config.py (modified) (1 diff)
• trunk/cherrypy/test/test_config.py (modified) (3 diffs)

trunk/cherrypy/_cpserver.py

@@ -45 +45 @@
-        
-        conf = cherrypy.config.get
+        
+        if not init_only:
+            init_only = conf('server.init_only', False)
+        
+        if server is None:
+            server = conf('server.instance', None)
-        if server is None:
-            if server_class is _missing:
@@ -58 +64 @@
-                self.httpserver = server_class()
-        else:
+            if isinstance(server, basestring):
+                server = cptools.attributes(server)
-            self.httpserverclass = server.__class__
-            self.httpserver = server

trunk/cherrypy/config.py

@@ -53 +53 @@
-        'server.show_tracebacks': False,
-        'server.log_request_headers': False,
+        },
+    "embedded": {
+        'autoreload.on': False,
+        'server.log_to_screen': False,
+        'server.init_only': True,
+        'server.class': None,
-        },
-    }

trunk/cherrypy/test/test_config.py

@@ -26 +26 @@
-    index.exposed = True
-    prod = index
-
+
-
-cherrypy.tree.mount(Root())
@@ -52 +52 @@
-_env_conf = {'/': {'server.environment': 'development'},
-             '/prod': {'server.environment': 'production'},
+             '/embed': {'server.environment': 'embedded'},
-             }
-cherrypy.tree.mount(Env(), "/env", _env_conf)
@@ -97 +98 @@
-            self.getPage("/env/prod/?key=" + key)
-            self.assertBody(str(val))
+        for key, val in cherrypy.config.environments['embedded'].iteritems():
+            self.getPage("/env/embed/?key=" + key)
+            data = self.body.split("\n")[0]
+            self.assertEqual(data, str(val))
-
-