Commit 5fd62b57 authored by Jerome Mariette's avatar Jerome Mariette
Browse files

No commit message

No commit message
parent 72cef85c
......@@ -119,7 +119,7 @@ class JFlowServer (object):
self.jflow_config_reader = JFlowConfigReader()
@staticmethod
def quickstart(server_class, config, daemon=False):
def quickstart(server_class, config=None, daemon=False):
# daemonize the server if asked to
if daemon:
......@@ -129,6 +129,15 @@ class JFlowServer (object):
# define the socket host and port
jflowconf = JFlowConfigReader()
socket_opts = jflowconf.get_socket_options()
# add the result directory
if config is None or not config.has_key('/'):
config['/'] = {'tools.staticdir.root': jflowconf.get_work_directory()}
else:
os.symlink(jflowconf.get_work_directory(), os.path.join(config['/']['tools.staticdir.root'], "data"))
config[os.path.join('/', JFlowServer.JFLOW_WDATA)] = {'tools.staticdir.on' : True,
'tools.staticdir.dir' : jflowconf.get_work_directory()}
# remove any limit on the request body size; cherrypy's default is 100MB
# (maybe we should just increase it ?)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment