Browse Source

Use NilmDB serializer for ProcessManager

tags/nilmrun-1.2.4^0
Jim Paris 10 years ago
parent
commit
a8ecad9329
3 changed files with 7 additions and 3 deletions
  1. +1
    -1
      README.txt
  2. +5
    -1
      nilmrun/server.py
  3. +1
    -1
      setup.py

+ 1
- 1
README.txt View File

@@ -7,7 +7,7 @@ Prerequisites:
sudo apt-get install python2.7 python-setuptools

# Plus nilmdb and its dependencies
nilmdb (1.8.2+)
nilmdb (1.8.3+)

Install:



+ 5
- 1
nilmrun/server.py View File

@@ -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)


+ 1
- 1
setup.py View File

@@ -61,7 +61,7 @@ setup(name='nilmrun',
long_description = "NILM Database Filter Runner",
license = "Proprietary",
author_email = 'jim@jtan.com',
install_requires = [ 'nilmdb >= 1.8.2',
install_requires = [ 'nilmdb >= 1.8.3',
'psutil >= 0.3.0',
'cherrypy >= 3.2',
'simplejson',


Loading…
Cancel
Save