@@ -409,7 +409,6 @@ class Exiter(object):
class Server(object):
def __init__(self, db, host = '127.0.0.1', port = 8080,
stoppable = False, # whether /exit URL exists
embedded = True, # hide diagnostics and output, etc
fast_shutdown = False, # don't wait for clients to disconn.
force_traceback = False, # include traceback in all errors
basepath = '', # base URL path for cherrypy.tree
@@ -417,7 +416,6 @@ class Server(object):
# Save server version, just for verification during tests
self.version = nilmdb.__version__
self.embedded = embedded
self.db = db
if not getattr(db, "_thread_safe", None):
raise KeyError("Database object " + str(db) + " doesn't claim "
@@ -427,13 +425,12 @@ class Server(object):
# Build up global server configuration
cherrypy.config.update({
'environment': 'embedded',
'server.socket_host': host,
'server.socket_port': port,
'engine.autoreload.on': False,
'server.max_request_body_size': 8*1024*1024,
})
if self.embedded: # pragma: no branch (always taken in test suite)
cherrypy.config.update({ 'environment': 'embedded' })
# Build up application specific configuration
app_config = {}
@@ -491,7 +488,7 @@ class Server(object):
self.force_traceback)
def start(self, blocking = False, event = None):
cherrypy_start(blocking, event, self.embedded )
cherrypy_start(blocking, event)
def stop(self):
cherrypy_stop()
@@ -518,8 +515,7 @@ def wsgi_application(dbpath, basepath):
try:
db = nilmdb.utils.serializer_proxy(nilmdb.server.NilmDB)(dbpath)
_wsgi_server = nilmdb.server.Server(
db, embedded = True,
basepath = basepath.rstrip('/'))
db, basepath = basepath.rstrip('/'))
except Exception:
# Build an error message on failure
import pprint