Compare commits
1 Commits
nilmrun-1.
...
nilmrun-1.
Author | SHA1 | Date | |
---|---|---|---|
18a5cd6334 |
@@ -9,7 +9,7 @@ Prerequisites:
|
|||||||
# Base dependencies
|
# Base dependencies
|
||||||
sudo apt-get install python-numpy python-scipy
|
sudo apt-get install python-numpy python-scipy
|
||||||
|
|
||||||
nilmdb (1.8.0+)
|
nilmdb (1.8.2+)
|
||||||
|
|
||||||
Install:
|
Install:
|
||||||
|
|
||||||
|
@@ -23,6 +23,7 @@ from nilmdb.server.serverutil import (
|
|||||||
json_error_page,
|
json_error_page,
|
||||||
cherrypy_start,
|
cherrypy_start,
|
||||||
cherrypy_stop,
|
cherrypy_stop,
|
||||||
|
bool_param,
|
||||||
)
|
)
|
||||||
import nilmrun
|
import nilmrun
|
||||||
import nilmrun.testfilter
|
import nilmrun.testfilter
|
||||||
@@ -77,6 +78,7 @@ class AppProcess(object):
|
|||||||
def status(self, pid, clear = False):
|
def status(self, pid, clear = False):
|
||||||
"""Return status about a process. If clear = True, also clear
|
"""Return status about a process. If clear = True, also clear
|
||||||
the log."""
|
the log."""
|
||||||
|
clear = bool_param(clear)
|
||||||
if pid not in self.manager:
|
if pid not in self.manager:
|
||||||
raise cherrypy.HTTPError("404 Not Found", "No such PID")
|
raise cherrypy.HTTPError("404 Not Found", "No such PID")
|
||||||
status = self.process_status(pid)
|
status = self.process_status(pid)
|
||||||
|
2
setup.py
2
setup.py
@@ -61,7 +61,7 @@ setup(name='nilmrun',
|
|||||||
long_description = "NILM Database Filter Runner",
|
long_description = "NILM Database Filter Runner",
|
||||||
license = "Proprietary",
|
license = "Proprietary",
|
||||||
author_email = 'jim@jtan.com',
|
author_email = 'jim@jtan.com',
|
||||||
install_requires = [ 'nilmdb >= 1.8.0',
|
install_requires = [ 'nilmdb >= 1.8.2',
|
||||||
'nilmtools >= 1.2.2',
|
'nilmtools >= 1.2.2',
|
||||||
'numpy',
|
'numpy',
|
||||||
'scipy',
|
'scipy',
|
||||||
|
Reference in New Issue
Block a user