|
|
@@ -22,6 +22,7 @@ from nilmdb.server.serverutil import ( |
|
|
|
cherrypy_stop, |
|
|
|
bool_param, |
|
|
|
) |
|
|
|
from nilmdb.utils import serializer_proxy |
|
|
|
import nilmrun |
|
|
|
import nilmrun.testfilter |
|
|
|
|
|
|
@@ -204,8 +205,11 @@ class Server(object): |
|
|
|
# error messages. |
|
|
|
cherrypy._cperror._ie_friendly_error_sizes = {} |
|
|
|
|
|
|
|
# The manager maintains internal state and isn't necessarily |
|
|
|
# thread-safe, so wrap it in the serializer. |
|
|
|
manager = serializer_proxy(nilmrun.processmanager.ProcessManager)() |
|
|
|
|
|
|
|
# Build up the application and mount it |
|
|
|
manager = nilmrun.processmanager.ProcessManager() |
|
|
|
root = App() |
|
|
|
root.process = AppProcess(manager) |
|
|
|
root.run = AppRun(manager) |
|
|
|