Compare commits
2 Commits
nilmrun-1.
...
nilmrun-1.
Author | SHA1 | Date | |
---|---|---|---|
18a5cd6334 | |||
7ec4d60d38 |
@@ -9,7 +9,7 @@ Prerequisites:
|
||||
# Base dependencies
|
||||
sudo apt-get install python-numpy python-scipy
|
||||
|
||||
nilmdb (1.8.0+)
|
||||
nilmdb (1.8.2+)
|
||||
|
||||
Install:
|
||||
|
||||
|
@@ -21,9 +21,9 @@ arbitrary commands.
|
||||
SSLEngine On
|
||||
|
||||
WSGIScriptAlias /nilmrun /home/nilm/nilmrun.wsgi
|
||||
WSGIProcessGroup nilmrun-procgroup
|
||||
WSGIDaemonProcess nilmrun-procgroup threads=32 user=nilm group=nilm
|
||||
<Location /nilmrun>
|
||||
WSGIProcessGroup nilmrun-procgroup
|
||||
WSGIApplicationGroup nilmrun-appgroup
|
||||
SSLRequireSSL
|
||||
|
||||
|
@@ -23,6 +23,7 @@ from nilmdb.server.serverutil import (
|
||||
json_error_page,
|
||||
cherrypy_start,
|
||||
cherrypy_stop,
|
||||
bool_param,
|
||||
)
|
||||
import nilmrun
|
||||
import nilmrun.testfilter
|
||||
@@ -77,6 +78,7 @@ class AppProcess(object):
|
||||
def status(self, pid, clear = False):
|
||||
"""Return status about a process. If clear = True, also clear
|
||||
the log."""
|
||||
clear = bool_param(clear)
|
||||
if pid not in self.manager:
|
||||
raise cherrypy.HTTPError("404 Not Found", "No such PID")
|
||||
status = self.process_status(pid)
|
||||
|
Reference in New Issue
Block a user