Commits

Robert Brewer committed 00bd250

You may now pass multiple --config args to cherryd.

Comments (0)

Files changed (2)

 from cherrypy.process import plugins, servers
 
 
-def start(configfile=None, daemonize=False, environment=None,
+def start(configfiles=None, daemonize=False, environment=None,
           fastcgi=False, pidfile=None):
     """Subscribe all engine plugins and start the engine."""
-    if configfile:
-        cherrypy.config.update(configfile)
+    for c in configfiles or []:
+        cherrypy.config.update(c)
     
     engine = cherrypy.engine
     
     from optparse import OptionParser
     
     p = OptionParser()
-    p.add_option('-c', '--config', dest='config',
-                 help="specify a config file")
+    p.add_option('-c', '--config', action="append", dest='config',
+                 help="specify config file(s)")
     p.add_option('-d', action="store_true", dest='daemonize',
                  help="run the server as a daemon")
     p.add_option('-e', '--environment', dest='environment', default=None,

cherrypy/scaffold/__init__.py

 Even before any tweaking, this should serve a few demonstration pages.
 Change to this directory and run:
 
-    python cherrypy\cherryd cherrypy\scaffold\site.conf
+    python cherrypy\cherryd -c cherrypy\scaffold\site.conf
 
 """
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.