Compare commits
15 Commits
nilmrun-1.
...
nilmrun-1.
Author | SHA1 | Date | |
---|---|---|---|
cafdfce4f0 | |||
477c27a4e6 | |||
bed26e099b | |||
9224566f9b | |||
a8ecad9329 | |||
5b878378f3 | |||
5cd38f1ba9 | |||
d7551bde0b | |||
40fd377a38 | |||
6e7f3ac704 | |||
29adb47a33 | |||
7c605a469a | |||
f5225f88f9 | |||
32e59310ef | |||
5a33ef48cc |
@@ -6,10 +6,8 @@ Prerequisites:
|
|||||||
# Runtime and build environments
|
# Runtime and build environments
|
||||||
sudo apt-get install python2.7 python-setuptools
|
sudo apt-get install python2.7 python-setuptools
|
||||||
|
|
||||||
# Base dependencies
|
# Plus nilmdb and its dependencies
|
||||||
sudo apt-get install python-numpy python-scipy
|
nilmdb (1.9.5+)
|
||||||
|
|
||||||
nilmdb (1.8.2+)
|
|
||||||
|
|
||||||
Install:
|
Install:
|
||||||
|
|
||||||
|
@@ -43,9 +43,8 @@ class LogReceiver(object):
|
|||||||
|
|
||||||
class Process(object):
|
class Process(object):
|
||||||
"""Spawn and manage a subprocess, and capture its output."""
|
"""Spawn and manage a subprocess, and capture its output."""
|
||||||
def __init__(self, name, argv, tempfile = None):
|
def __init__(self, argv, tempfile = None):
|
||||||
self.start_time = None
|
self.start_time = None
|
||||||
self.name = name
|
|
||||||
|
|
||||||
# Use a pipe for communicating log data
|
# Use a pipe for communicating log data
|
||||||
(rpipe, wpipe) = os.pipe()
|
(rpipe, wpipe) = os.pipe()
|
||||||
@@ -82,38 +81,47 @@ class Process(object):
|
|||||||
def terminate(self, timeout = 1.0):
|
def terminate(self, timeout = 1.0):
|
||||||
"""Terminate a process, and all of its children that are in the same
|
"""Terminate a process, and all of its children that are in the same
|
||||||
process group."""
|
process group."""
|
||||||
# First give it some time to die on its own
|
try:
|
||||||
if self._join(timeout):
|
# First give it some time to die on its own
|
||||||
|
if self._join(timeout):
|
||||||
|
return True
|
||||||
|
|
||||||
|
def getpgid(pid):
|
||||||
|
try:
|
||||||
|
return os.getpgid(pid)
|
||||||
|
except OSError: # pragma: no cover
|
||||||
|
return None
|
||||||
|
|
||||||
|
def kill(pid, sig):
|
||||||
|
try:
|
||||||
|
return os.kill(pid, sig)
|
||||||
|
except OSError: # pragma: no cover
|
||||||
|
return
|
||||||
|
|
||||||
|
# Find all children
|
||||||
|
group = getpgid(self._process.pid)
|
||||||
|
main = psutil.Process(self._process.pid)
|
||||||
|
allproc = [ main ] + main.get_children(recursive = True)
|
||||||
|
|
||||||
|
# Kill with SIGTERM, if they're still in this process group
|
||||||
|
for proc in allproc:
|
||||||
|
if getpgid(proc.pid) == group:
|
||||||
|
kill(proc.pid, signal.SIGTERM)
|
||||||
|
|
||||||
|
# Wait for it to die again
|
||||||
|
if self._join(timeout):
|
||||||
|
return True
|
||||||
|
|
||||||
|
# One more try with SIGKILL
|
||||||
|
for proc in allproc:
|
||||||
|
if getpgid(proc.pid) == group:
|
||||||
|
kill(proc.pid, signal.SIGKILL)
|
||||||
|
|
||||||
|
# See if it worked
|
||||||
|
return self._join(timeout)
|
||||||
|
except psutil.Error: # pragma: no cover (race condition)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def getpgid(pid):
|
|
||||||
try:
|
|
||||||
return os.getpgid(pid)
|
|
||||||
except OSError: # pragma: no cover
|
|
||||||
return None
|
|
||||||
|
|
||||||
# Find all children
|
|
||||||
group = getpgid(self._process.pid)
|
|
||||||
main = psutil.Process(self._process.pid)
|
|
||||||
allproc = [ main ] + main.get_children(recursive = True)
|
|
||||||
|
|
||||||
# Kill with SIGTERM, if they're still in this process group
|
|
||||||
for proc in allproc:
|
|
||||||
if getpgid(proc.pid) == group:
|
|
||||||
os.kill(proc.pid, signal.SIGTERM)
|
|
||||||
|
|
||||||
# Wait for it to die again
|
|
||||||
if self._join(timeout):
|
|
||||||
return True
|
|
||||||
|
|
||||||
# One more try with SIGKILL
|
|
||||||
for proc in allproc:
|
|
||||||
if getpgid(proc.pid) == group:
|
|
||||||
os.kill(proc.pid, signal.SIGKILL)
|
|
||||||
|
|
||||||
# See if it worked
|
|
||||||
return self._join(timeout)
|
|
||||||
|
|
||||||
def clear_log(self):
|
def clear_log(self):
|
||||||
self._log.clear()
|
self._log.clear()
|
||||||
|
|
||||||
@@ -129,13 +137,74 @@ class Process(object):
|
|||||||
def exitcode(self):
|
def exitcode(self):
|
||||||
return self._process.returncode
|
return self._process.returncode
|
||||||
|
|
||||||
|
def get_info_prepare(self):
|
||||||
|
"""Prepare the process list and measurement for .get_info.
|
||||||
|
Call .get_info() about a second later."""
|
||||||
|
try:
|
||||||
|
main = psutil.Process(self._process.pid)
|
||||||
|
self._process_list = [ main ] + main.get_children(recursive = True)
|
||||||
|
for proc in self._process_list:
|
||||||
|
proc.get_cpu_percent(0)
|
||||||
|
except psutil.Error: # pragma: no cover (race condition)
|
||||||
|
self._process_list = [ ]
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def get_empty_info():
|
||||||
|
return { "cpu_percent": 0,
|
||||||
|
"cpu_user": 0,
|
||||||
|
"cpu_sys": 0,
|
||||||
|
"mem_phys": 0,
|
||||||
|
"mem_virt": 0,
|
||||||
|
"io_read": 0,
|
||||||
|
"io_write": 0,
|
||||||
|
"procs": 0 }
|
||||||
|
|
||||||
|
def get_info(self):
|
||||||
|
"""Return a dictionary with info about the process CPU and memory
|
||||||
|
usage. Call .get_info_prepare() about a second before this."""
|
||||||
|
d = self.get_empty_info()
|
||||||
|
for proc in self._process_list:
|
||||||
|
try:
|
||||||
|
d["cpu_percent"] += proc.get_cpu_percent(0)
|
||||||
|
cpuinfo = proc.get_cpu_times()
|
||||||
|
d["cpu_user"] += cpuinfo.user
|
||||||
|
d["cpu_sys"] += cpuinfo.system
|
||||||
|
meminfo = proc.get_memory_info()
|
||||||
|
d["mem_phys"] += meminfo.rss
|
||||||
|
d["mem_virt"] += meminfo.vms
|
||||||
|
ioinfo = proc.get_io_counters()
|
||||||
|
d["io_read"] += ioinfo.read_bytes
|
||||||
|
d["io_write"] += ioinfo.write_bytes
|
||||||
|
d["procs"] += 1
|
||||||
|
except psutil.Error:
|
||||||
|
pass
|
||||||
|
return d
|
||||||
|
|
||||||
class ProcessManager(object):
|
class ProcessManager(object):
|
||||||
"""Track and manage a collection of Process objects"""
|
"""Track and manage a collection of Process objects"""
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.processes = {}
|
self.processes = {}
|
||||||
self.tmpfiles = {}
|
self.tmpdirs = {}
|
||||||
self.tmpdir = tempfile.mkdtemp(prefix = "nilmrun-usercode-")
|
atexit.register(self._atexit)
|
||||||
atexit.register(shutil.rmtree, self.tmpdir)
|
|
||||||
|
def _cleanup_tmpdir(self, pid):
|
||||||
|
if pid in self.tmpdirs:
|
||||||
|
try:
|
||||||
|
shutil.rmtree(self.tmpdirs[pid])
|
||||||
|
except OSError: # pragma: no cover
|
||||||
|
pass
|
||||||
|
del self.tmpdirs[pid]
|
||||||
|
|
||||||
|
def _atexit(self):
|
||||||
|
# Kill remaining processes, remove their dirs
|
||||||
|
for pid in self.processes.keys():
|
||||||
|
try:
|
||||||
|
self.processes[pid].terminate()
|
||||||
|
del self.processes[pid]
|
||||||
|
shutil.rmtree(self.tmpdirs[pid])
|
||||||
|
del self.tmpdirs[pid]
|
||||||
|
except Exception: # pragma: no cover
|
||||||
|
pass
|
||||||
|
|
||||||
def __iter__(self):
|
def __iter__(self):
|
||||||
return iter(self.processes.keys())
|
return iter(self.processes.keys())
|
||||||
@@ -143,24 +212,42 @@ class ProcessManager(object):
|
|||||||
def __getitem__(self, key):
|
def __getitem__(self, key):
|
||||||
return self.processes[key]
|
return self.processes[key]
|
||||||
|
|
||||||
def run_code(self, procname, code, args):
|
def run_code(self, code, args):
|
||||||
"""Evaluate 'code' as if it were placed into a Python file and
|
"""Evaluate 'code' as if it were placed into a Python file and
|
||||||
executed. The arguments, which must be strings, will be
|
executed. The arguments, which must be strings, will be
|
||||||
accessible in the code as sys.argv[1:]."""
|
accessible in the code as sys.argv[1:]."""
|
||||||
# The easiest way to do this, by far, is to just write the
|
# The easiest way to do this, by far, is to just write the
|
||||||
# code to a file.
|
# code to a file. Make a directory to put it in.
|
||||||
(fd, path) = tempfile.mkstemp(prefix = "nilmrun-usercode-",
|
tmpdir = tempfile.mkdtemp(prefix = "nilmrun-usercode-")
|
||||||
suffix = ".py", dir=self.tmpdir)
|
try:
|
||||||
with os.fdopen(fd, 'w') as f:
|
# Write the code
|
||||||
f.write(code)
|
codepath = os.path.join(tmpdir, "usercode.py")
|
||||||
argv = [ sys.executable, "-B", "-s", "-u", path ] + args
|
with open(codepath, "w") as f:
|
||||||
pid = self.run_command(procname, argv)
|
f.write(code)
|
||||||
self.tmpfiles[pid] = path
|
# Save the args too, for debugging purposes
|
||||||
return pid
|
with open(os.path.join(tmpdir, "args.txt"), "w") as f:
|
||||||
|
f.write(repr(args))
|
||||||
|
|
||||||
def run_command(self, procname, argv):
|
# Run the code
|
||||||
|
argv = [ sys.executable, "-B", "-s", "-u", codepath ] + args
|
||||||
|
pid = self.run_command(argv)
|
||||||
|
|
||||||
|
# Save the temp dir
|
||||||
|
self.tmpdirs[pid] = tmpdir
|
||||||
|
tmpdir = None # Don't need to remove it anymore
|
||||||
|
|
||||||
|
return pid
|
||||||
|
finally:
|
||||||
|
# Clean up tempdir if we didn't finish
|
||||||
|
if tmpdir is not None:
|
||||||
|
try:
|
||||||
|
shutil.rmtree(tmpdir)
|
||||||
|
except OSError: # pragma: no cover
|
||||||
|
pass
|
||||||
|
|
||||||
|
def run_command(self, argv):
|
||||||
"""Execute a command line program"""
|
"""Execute a command line program"""
|
||||||
new = Process(procname, argv)
|
new = Process(argv)
|
||||||
self.processes[new.pid] = new
|
self.processes[new.pid] = new
|
||||||
return new.pid
|
return new.pid
|
||||||
|
|
||||||
@@ -168,10 +255,39 @@ class ProcessManager(object):
|
|||||||
return self.processes[pid].terminate()
|
return self.processes[pid].terminate()
|
||||||
|
|
||||||
def remove(self, pid):
|
def remove(self, pid):
|
||||||
if pid in self.tmpfiles:
|
self._cleanup_tmpdir(pid)
|
||||||
try:
|
|
||||||
os.unlink(self.tmpfiles[pid])
|
|
||||||
except OSError: # pragma: no cover
|
|
||||||
pass
|
|
||||||
del self.tmpfiles[pid]
|
|
||||||
del self.processes[pid]
|
del self.processes[pid]
|
||||||
|
|
||||||
|
def get_info(self):
|
||||||
|
"""Get info about all running PIDs"""
|
||||||
|
info = { "total" : Process.get_empty_info(),
|
||||||
|
"pids" : {},
|
||||||
|
"system" : {}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Trigger CPU usage collection
|
||||||
|
for pid in self:
|
||||||
|
self[pid].get_info_prepare()
|
||||||
|
psutil.cpu_percent(0, percpu = True)
|
||||||
|
|
||||||
|
# Give it some time
|
||||||
|
time.sleep(1)
|
||||||
|
|
||||||
|
# Retrieve info for system
|
||||||
|
info["system"]["cpu_percent"] = sum(psutil.cpu_percent(0, percpu=True))
|
||||||
|
info["system"]["cpu_max"] = 100.0 * psutil.NUM_CPUS
|
||||||
|
info["system"]["procs"] = len(psutil.get_pid_list())
|
||||||
|
# psutil > 0.6.0's psutil.virtual_memory() would be better here,
|
||||||
|
# but this should give the same info.
|
||||||
|
meminfo = psutil.phymem_usage()
|
||||||
|
info["system"]["mem_total"] = meminfo.total
|
||||||
|
info["system"]["mem_used"] = int(meminfo.total * meminfo.percent / 100)
|
||||||
|
|
||||||
|
# Retrieve info for each PID
|
||||||
|
for pid in self:
|
||||||
|
info["pids"][pid] = self[pid].get_info()
|
||||||
|
# Update totals
|
||||||
|
for key in info["total"]:
|
||||||
|
info["total"][key] += info["pids"][pid][key]
|
||||||
|
|
||||||
|
return info
|
||||||
|
@@ -5,10 +5,7 @@ import sys
|
|||||||
import os
|
import os
|
||||||
import socket
|
import socket
|
||||||
import simplejson as json
|
import simplejson as json
|
||||||
import decorator
|
|
||||||
import psutil
|
|
||||||
import traceback
|
import traceback
|
||||||
import argparse
|
|
||||||
import time
|
import time
|
||||||
|
|
||||||
import nilmdb
|
import nilmdb
|
||||||
@@ -25,6 +22,7 @@ from nilmdb.server.serverutil import (
|
|||||||
cherrypy_stop,
|
cherrypy_stop,
|
||||||
bool_param,
|
bool_param,
|
||||||
)
|
)
|
||||||
|
from nilmdb.utils import serializer_proxy
|
||||||
import nilmrun
|
import nilmrun
|
||||||
import nilmrun.testfilter
|
import nilmrun.testfilter
|
||||||
|
|
||||||
@@ -63,13 +61,16 @@ class AppProcess(object):
|
|||||||
self.manager = manager
|
self.manager = manager
|
||||||
|
|
||||||
def process_status(self, pid):
|
def process_status(self, pid):
|
||||||
|
# We need to convert the log (which is bytes) to Unicode
|
||||||
|
# characters, in order to send it via JSON. Treat it as UTF-8
|
||||||
|
# but replace invalid characters with markers.
|
||||||
|
log = self.manager[pid].log.decode('utf-8', errors='replace')
|
||||||
return {
|
return {
|
||||||
"pid": pid,
|
"pid": pid,
|
||||||
"alive": self.manager[pid].alive,
|
"alive": self.manager[pid].alive,
|
||||||
"exitcode": self.manager[pid].exitcode,
|
"exitcode": self.manager[pid].exitcode,
|
||||||
"name": self.manager[pid].name,
|
|
||||||
"start_time": self.manager[pid].start_time,
|
"start_time": self.manager[pid].start_time,
|
||||||
"log": self.manager[pid].log,
|
"log": log
|
||||||
}
|
}
|
||||||
|
|
||||||
# /process/status
|
# /process/status
|
||||||
@@ -93,6 +94,14 @@ class AppProcess(object):
|
|||||||
"""Return a list of processes in the manager."""
|
"""Return a list of processes in the manager."""
|
||||||
return list(self.manager)
|
return list(self.manager)
|
||||||
|
|
||||||
|
# /process/info
|
||||||
|
@cherrypy.expose
|
||||||
|
@cherrypy.tools.json_out()
|
||||||
|
def info(self):
|
||||||
|
"""Return detailed CPU and memory info about the system and
|
||||||
|
all processes"""
|
||||||
|
return self.manager.get_info()
|
||||||
|
|
||||||
# /process/remove
|
# /process/remove
|
||||||
@cherrypy.expose
|
@cherrypy.expose
|
||||||
@cherrypy.tools.json_in()
|
@cherrypy.tools.json_in()
|
||||||
@@ -126,7 +135,7 @@ class AppRun(object):
|
|||||||
if not isinstance(argv, list):
|
if not isinstance(argv, list):
|
||||||
raise cherrypy.HTTPError("400 Bad Request",
|
raise cherrypy.HTTPError("400 Bad Request",
|
||||||
"argv must be a list of strings")
|
"argv must be a list of strings")
|
||||||
return self.manager.run_command("command", argv)
|
return self.manager.run_command(argv)
|
||||||
|
|
||||||
# /run/code
|
# /run/code
|
||||||
@cherrypy.expose
|
@cherrypy.expose
|
||||||
@@ -134,16 +143,18 @@ class AppRun(object):
|
|||||||
@cherrypy.tools.json_out()
|
@cherrypy.tools.json_out()
|
||||||
@exception_to_httperror(nilmrun.processmanager.ProcessError)
|
@exception_to_httperror(nilmrun.processmanager.ProcessError)
|
||||||
@cherrypy.tools.CORS_allow(methods = ["POST"])
|
@cherrypy.tools.CORS_allow(methods = ["POST"])
|
||||||
def code(self, code, args):
|
def code(self, code, args = None):
|
||||||
"""Execute arbitrary Python code. 'code' is a formatted string.
|
"""Execute arbitrary Python code. 'code' is a formatted string.
|
||||||
It will be run as if it were written into a Python file and
|
It will be run as if it were written into a Python file and
|
||||||
executed. 'args' is a list of strings, and they are passed
|
executed. 'args' is a list of strings, and they are passed
|
||||||
on the command line as additional arguments (i.e., they end up
|
on the command line as additional arguments (i.e., they end up
|
||||||
in sys.argv[1:])"""
|
in sys.argv[1:])"""
|
||||||
|
if args is None:
|
||||||
|
args = []
|
||||||
if not isinstance(args, list):
|
if not isinstance(args, list):
|
||||||
raise cherrypy.HTTPError("400 Bad Request",
|
raise cherrypy.HTTPError("400 Bad Request",
|
||||||
"args must be a list of strings")
|
"args must be a list of strings")
|
||||||
return self.manager.run_code("usercode", code, args)
|
return self.manager.run_code(code, args)
|
||||||
|
|
||||||
class Server(object):
|
class Server(object):
|
||||||
def __init__(self, host = '127.0.0.1', port = 8080,
|
def __init__(self, host = '127.0.0.1', port = 8080,
|
||||||
@@ -194,8 +205,12 @@ class Server(object):
|
|||||||
# error messages.
|
# error messages.
|
||||||
cherrypy._cperror._ie_friendly_error_sizes = {}
|
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
|
# Build up the application and mount it
|
||||||
manager = nilmrun.processmanager.ProcessManager()
|
self._manager = manager
|
||||||
root = App()
|
root = App()
|
||||||
root.process = AppProcess(manager)
|
root.process = AppProcess(manager)
|
||||||
root.run = AppRun(manager)
|
root.run = AppRun(manager)
|
||||||
|
51
scripts/kill.py
Executable file
51
scripts/kill.py
Executable file
@@ -0,0 +1,51 @@
|
|||||||
|
#!/usr/bin/python
|
||||||
|
|
||||||
|
from nilmdb.client.httpclient import HTTPClient, ClientError, ServerError
|
||||||
|
from nilmdb.utils.printf import *
|
||||||
|
import nilmrun
|
||||||
|
|
||||||
|
import argparse
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
|
def main():
|
||||||
|
"""Kill/remove a process from the NilmRun server"""
|
||||||
|
def_url = os.environ.get("NILMRUN_URL", "http://localhost/nilmrun/")
|
||||||
|
parser = argparse.ArgumentParser(
|
||||||
|
description = 'Kill/remove a process from the NilmRun server',
|
||||||
|
formatter_class = argparse.ArgumentDefaultsHelpFormatter)
|
||||||
|
parser.add_argument("-V", "--version", action="version",
|
||||||
|
version = nilmrun.__version__)
|
||||||
|
group = parser.add_argument_group("Standard options")
|
||||||
|
group.add_argument('-u', '--url',
|
||||||
|
help = 'NilmRun server URL', default = def_url)
|
||||||
|
group.add_argument('-n', '--noverify', action="store_true",
|
||||||
|
help = 'Disable SSL certificate verification')
|
||||||
|
group = parser.add_argument_group("Program")
|
||||||
|
group.add_argument('-q', '--quiet', action="store_true",
|
||||||
|
help = "Don't print out the final log contents")
|
||||||
|
group.add_argument('pid', nargs='+', help="PIDs to kill")
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
client = HTTPClient(baseurl = args.url, verify_ssl = not args.noverify)
|
||||||
|
|
||||||
|
# Kill or remove process
|
||||||
|
all_failed = True
|
||||||
|
for pid in args.pid:
|
||||||
|
try:
|
||||||
|
s = client.post("process/remove", { "pid": pid })
|
||||||
|
if not args.quiet:
|
||||||
|
sys.stdout.write(s['log'])
|
||||||
|
all_failed = False
|
||||||
|
except ClientError as e:
|
||||||
|
if "404" in e.status:
|
||||||
|
fprintf(sys.stderr, "no such pid: %s\n", pid)
|
||||||
|
else:
|
||||||
|
raise
|
||||||
|
|
||||||
|
# Return error if we failed to remove any of them
|
||||||
|
if all_failed:
|
||||||
|
raise SystemExit(1)
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
66
scripts/ps.py
Executable file
66
scripts/ps.py
Executable file
@@ -0,0 +1,66 @@
|
|||||||
|
#!/usr/bin/python
|
||||||
|
|
||||||
|
from nilmdb.client.httpclient import HTTPClient, ClientError, ServerError
|
||||||
|
from nilmdb.utils.printf import *
|
||||||
|
from nilmdb.utils import datetime_tz
|
||||||
|
import nilmrun
|
||||||
|
|
||||||
|
import argparse
|
||||||
|
import os
|
||||||
|
|
||||||
|
def main():
|
||||||
|
"""List NilmRun processes"""
|
||||||
|
def_url = os.environ.get("NILMRUN_URL", "http://localhost/nilmrun/")
|
||||||
|
parser = argparse.ArgumentParser(
|
||||||
|
description = 'List NilmRun processes',
|
||||||
|
formatter_class = argparse.ArgumentDefaultsHelpFormatter)
|
||||||
|
parser.add_argument("-V", "--version", action="version",
|
||||||
|
version = nilmrun.__version__)
|
||||||
|
group = parser.add_argument_group("Standard options")
|
||||||
|
group.add_argument('-u', '--url',
|
||||||
|
help = 'NilmRun server URL', default = def_url)
|
||||||
|
group.add_argument('-n', '--noverify', action="store_true",
|
||||||
|
help = 'Disable SSL certificate verification')
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
client = HTTPClient(baseurl = args.url, verify_ssl = not args.noverify)
|
||||||
|
# Print overall system info
|
||||||
|
info = client.get("process/info")
|
||||||
|
total = info['total']
|
||||||
|
system = info['system']
|
||||||
|
printf(" procs: %d nilm, %d other\n", info['total']['procs'],
|
||||||
|
info['system']['procs'] - info['total']['procs'])
|
||||||
|
printf(" cpu: %d%% nilm, %d%% other, %d%% max\n",
|
||||||
|
round(info['total']['cpu_percent']),
|
||||||
|
round(info['system']['cpu_percent'] - info['total']['cpu_percent']),
|
||||||
|
round(info['system']['cpu_max']))
|
||||||
|
printf(" mem: %d MiB used, %d MiB total, %d%%\n",
|
||||||
|
round(info['system']['mem_used'] / 1048576.0),
|
||||||
|
round(info['system']['mem_total'] / 1048576.0),
|
||||||
|
round(info['system']['mem_used'] * 100.0
|
||||||
|
/ info['system']['mem_total']))
|
||||||
|
|
||||||
|
if len(info['pids']) == 0:
|
||||||
|
printf("No running processes\n")
|
||||||
|
raise SystemExit(0)
|
||||||
|
|
||||||
|
# Print process detail for each managed process
|
||||||
|
fmt = "%-36s %-6s %-15s %-4s %-3s %-5s\n"
|
||||||
|
printf(fmt, "PID", "STATE", "SINCE", "PROC", "CPU", "LOG")
|
||||||
|
for pid in sorted(info['pids'].keys()):
|
||||||
|
pidinfo = client.get("process/status", { "pid": pid })
|
||||||
|
if pidinfo['alive']:
|
||||||
|
status = "alive"
|
||||||
|
else:
|
||||||
|
if pidinfo['exitcode']:
|
||||||
|
status = "error"
|
||||||
|
else:
|
||||||
|
status = "done"
|
||||||
|
dt = datetime_tz.datetime_tz.fromtimestamp(pidinfo['start_time'])
|
||||||
|
since = dt.strftime("%m/%d-%H:%M:%S")
|
||||||
|
printf(fmt, pid, status, since, info['pids'][pid]['procs'],
|
||||||
|
str(int(round(info['pids'][pid]['cpu_percent']))),
|
||||||
|
len(pidinfo['log']))
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
60
scripts/run.py
Executable file
60
scripts/run.py
Executable file
@@ -0,0 +1,60 @@
|
|||||||
|
#!/usr/bin/python
|
||||||
|
|
||||||
|
from nilmdb.client.httpclient import HTTPClient, ClientError, ServerError
|
||||||
|
from nilmdb.utils.printf import *
|
||||||
|
import nilmrun
|
||||||
|
|
||||||
|
import argparse
|
||||||
|
import os
|
||||||
|
import time
|
||||||
|
import sys
|
||||||
|
|
||||||
|
def main():
|
||||||
|
"""Run a command on the NilmRun server"""
|
||||||
|
def_url = os.environ.get("NILMRUN_URL", "http://localhost/nilmrun/")
|
||||||
|
parser = argparse.ArgumentParser(
|
||||||
|
description = 'Run a command on the NilmRun server',
|
||||||
|
formatter_class = argparse.ArgumentDefaultsHelpFormatter)
|
||||||
|
parser.add_argument("-V", "--version", action="version",
|
||||||
|
version = nilmrun.__version__)
|
||||||
|
group = parser.add_argument_group("Standard options")
|
||||||
|
group.add_argument('-u', '--url',
|
||||||
|
help = 'NilmRun server URL', default = def_url)
|
||||||
|
group.add_argument('-n', '--noverify', action="store_true",
|
||||||
|
help = 'Disable SSL certificate verification')
|
||||||
|
group = parser.add_argument_group("Program")
|
||||||
|
group.add_argument('-d', '--detach', action="store_true",
|
||||||
|
help = 'Run process and return immediately without '
|
||||||
|
'printing its output')
|
||||||
|
group.add_argument('cmd', help="Command to run")
|
||||||
|
group.add_argument('arg', nargs=argparse.REMAINDER,
|
||||||
|
help="Arguments for command")
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
client = HTTPClient(baseurl = args.url, verify_ssl = not args.noverify)
|
||||||
|
|
||||||
|
# Run command
|
||||||
|
pid = client.post("run/command", { "argv": [ args.cmd ] + args.arg })
|
||||||
|
|
||||||
|
# If we're detaching, just print the PID
|
||||||
|
if args.detach:
|
||||||
|
print pid
|
||||||
|
raise SystemExit(0)
|
||||||
|
|
||||||
|
# Otherwise, watch the log output, and kill the process when it's done
|
||||||
|
# or when this script terminates.
|
||||||
|
try:
|
||||||
|
while True:
|
||||||
|
s = client.get("process/status", { "pid": pid, "clear": 1 })
|
||||||
|
sys.stdout.write(s['log'])
|
||||||
|
sys.stdout.flush()
|
||||||
|
if not s['alive']:
|
||||||
|
break
|
||||||
|
time.sleep(1)
|
||||||
|
finally:
|
||||||
|
s = client.post("process/remove", { "pid": pid })
|
||||||
|
|
||||||
|
raise SystemExit(s['exitcode'])
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
12
setup.py
12
setup.py
@@ -61,10 +61,10 @@ 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.2',
|
install_requires = [ 'nilmdb >= 1.9.5',
|
||||||
'nilmtools >= 1.2.2',
|
'psutil >= 0.3.0',
|
||||||
'numpy',
|
'cherrypy >= 3.2',
|
||||||
'scipy',
|
'simplejson',
|
||||||
],
|
],
|
||||||
packages = [ 'nilmrun',
|
packages = [ 'nilmrun',
|
||||||
'nilmrun.scripts',
|
'nilmrun.scripts',
|
||||||
@@ -75,7 +75,9 @@ setup(name='nilmrun',
|
|||||||
entry_points = {
|
entry_points = {
|
||||||
'console_scripts': [
|
'console_scripts': [
|
||||||
'nilmrun-server = nilmrun.scripts.nilmrun_server:main',
|
'nilmrun-server = nilmrun.scripts.nilmrun_server:main',
|
||||||
'nilm-trainola = nilmrun.trainola:main',
|
'nilmrun-ps = nilmrun.scripts.ps:main',
|
||||||
|
'nilmrun-run = nilmrun.scripts.run:main',
|
||||||
|
'nilmrun-kill = nilmrun.scripts.kill:main',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
zip_safe = False,
|
zip_safe = False,
|
||||||
|
@@ -65,6 +65,7 @@ class TestClient(object):
|
|||||||
status = client.get("process/status", { "pid": pid })
|
status = client.get("process/status", { "pid": pid })
|
||||||
if status["alive"] == False:
|
if status["alive"] == False:
|
||||||
break
|
break
|
||||||
|
time.sleep(0.1)
|
||||||
else:
|
else:
|
||||||
raise AssertionError("process " + str(pid) + " didn't die in " +
|
raise AssertionError("process " + str(pid) + " didn't die in " +
|
||||||
str(timeout) + " seconds: " + repr(status))
|
str(timeout) + " seconds: " + repr(status))
|
||||||
@@ -145,7 +146,7 @@ class TestClient(object):
|
|||||||
|
|
||||||
# Verify that status looks OK
|
# Verify that status looks OK
|
||||||
status = client.get("process/status", { "pid": pid, "clear": True })
|
status = client.get("process/status", { "pid": pid, "clear": True })
|
||||||
for x in [ "pid", "alive", "exitcode", "name", "start_time", "log" ]:
|
for x in [ "pid", "alive", "exitcode", "start_time", "log" ]:
|
||||||
in_(x, status)
|
in_(x, status)
|
||||||
in_("dummy 0\ndummy 1\ndummy 2\ndummy 3\n", status["log"])
|
in_("dummy 0\ndummy 1\ndummy 2\ndummy 3\n", status["log"])
|
||||||
eq_(status["alive"], True)
|
eq_(status["alive"], True)
|
||||||
@@ -248,6 +249,7 @@ class TestClient(object):
|
|||||||
sys.stdout.flush()
|
sys.stdout.flush()
|
||||||
if status["alive"] == False:
|
if status["alive"] == False:
|
||||||
break
|
break
|
||||||
|
time.sleep(0.1)
|
||||||
status = client.post("process/remove", { "pid": pid })
|
status = client.post("process/remove", { "pid": pid })
|
||||||
os._exit(int(status["exitcode"]))
|
os._exit(int(status["exitcode"]))
|
||||||
|
|
||||||
@@ -256,7 +258,10 @@ class TestClient(object):
|
|||||||
eq_(client.get("process/list"), [])
|
eq_(client.get("process/list"), [])
|
||||||
|
|
||||||
def do(code, args, kill):
|
def do(code, args, kill):
|
||||||
pid = client.post("run/code", { "code": code, "args": args } )
|
if args is not None:
|
||||||
|
pid = client.post("run/code", { "code": code, "args": args } )
|
||||||
|
else:
|
||||||
|
pid = client.post("run/code", { "code": code } )
|
||||||
eq_(client.get("process/list"), [pid])
|
eq_(client.get("process/list"), [pid])
|
||||||
if kill:
|
if kill:
|
||||||
return self.wait_kill(client, pid)
|
return self.wait_kill(client, pid)
|
||||||
@@ -321,6 +326,15 @@ class TestClient(object):
|
|||||||
eq_(status["log"], "hello\n")
|
eq_(status["log"], "hello\n")
|
||||||
ne_(status["exitcode"], 0)
|
ne_(status["exitcode"], 0)
|
||||||
|
|
||||||
|
# default arguments are empty
|
||||||
|
code = textwrap.dedent("""
|
||||||
|
import sys
|
||||||
|
print 'args:', len(sys.argv[1:])
|
||||||
|
""")
|
||||||
|
status = do(code, None, False)
|
||||||
|
eq_(status["log"], "args: 0\n")
|
||||||
|
eq_(status["exitcode"], 0)
|
||||||
|
|
||||||
def test_client_08_bad_types(self):
|
def test_client_08_bad_types(self):
|
||||||
client = HTTPClient(baseurl = testurl, post_json = True)
|
client = HTTPClient(baseurl = testurl, post_json = True)
|
||||||
|
|
||||||
@@ -331,3 +345,65 @@ class TestClient(object):
|
|||||||
with assert_raises(ClientError) as e:
|
with assert_raises(ClientError) as e:
|
||||||
client.post("run/command", { "argv": "asdf" })
|
client.post("run/command", { "argv": "asdf" })
|
||||||
in_("must be a list", str(e.exception))
|
in_("must be a list", str(e.exception))
|
||||||
|
|
||||||
|
def test_client_09_info(self):
|
||||||
|
client = HTTPClient(baseurl = testurl, post_json = True)
|
||||||
|
|
||||||
|
# start some processes
|
||||||
|
a = client.post("run/command", { "argv": ["sleep","60"] } )
|
||||||
|
b = client.post("run/command", { "argv": ["sh","-c","sleep 2;true"] } )
|
||||||
|
c = client.post("run/command", { "argv": ["sh","-c","burnP5;true"] } )
|
||||||
|
d = client.post("run/command", { "argv": ["burnP5" ] } )
|
||||||
|
|
||||||
|
info = client.get("process/info")
|
||||||
|
eq_(info["pids"][a]["procs"], 1)
|
||||||
|
eq_(info["pids"][b]["procs"], 2)
|
||||||
|
eq_(info["pids"][c]["procs"], 2)
|
||||||
|
eq_(info["pids"][d]["procs"], 1)
|
||||||
|
eq_(info["total"]["procs"], 6)
|
||||||
|
lt_(info["pids"][a]["cpu_percent"], 50)
|
||||||
|
lt_(20, info["pids"][c]["cpu_percent"])
|
||||||
|
lt_(80, info["system"]["cpu_percent"])
|
||||||
|
|
||||||
|
time.sleep(2)
|
||||||
|
info = client.get("process/info")
|
||||||
|
eq_(info["pids"][b]["procs"], 0)
|
||||||
|
|
||||||
|
# kill all processes
|
||||||
|
for pid in client.get("process/list"):
|
||||||
|
client.post("process/remove", { "pid": pid })
|
||||||
|
|
||||||
|
def test_client_10_unicode(self):
|
||||||
|
client = HTTPClient(baseurl = testurl, post_json = True)
|
||||||
|
eq_(client.get("process/list"), [])
|
||||||
|
def verify(cmd, result):
|
||||||
|
pid = client.post("run/command", { "argv": [ "sh", "-c", cmd ] })
|
||||||
|
eq_(client.get("process/list"), [pid])
|
||||||
|
status = self.wait_end(client, pid)
|
||||||
|
eq_(result, status["log"])
|
||||||
|
|
||||||
|
# Unicode should work
|
||||||
|
verify("echo -n hello", "hello")
|
||||||
|
verify(u"echo -n ☠", u"☠")
|
||||||
|
verify("echo -ne \\\\xe2\\\\x98\\\\xa0", u"☠")
|
||||||
|
|
||||||
|
# Programs that spit out invalid UTF-8 should get replacement
|
||||||
|
# markers
|
||||||
|
verify("echo -ne \\\\xae", u"\ufffd")
|
||||||
|
|
||||||
|
def test_client_11_atexit(self):
|
||||||
|
# Leave a directory and running process behind, for the atexit
|
||||||
|
# handler to clean up. Here we trigger the atexit manually,
|
||||||
|
# since it's hard to trigger it as part of the test suite.
|
||||||
|
client = HTTPClient(baseurl = testurl, post_json = True)
|
||||||
|
code = textwrap.dedent("""
|
||||||
|
import time
|
||||||
|
time.sleep(10)
|
||||||
|
""")
|
||||||
|
client.post("run/code", { "code": code, "args": [ "hello"] })
|
||||||
|
|
||||||
|
# Trigger atexit function
|
||||||
|
test_server._manager._atexit()
|
||||||
|
|
||||||
|
# Ensure no processes exit
|
||||||
|
eq_(client.get("process/list"), [])
|
||||||
|
Reference in New Issue
Block a user