Commit 7f3dd187 authored by Swann Perarnau's avatar Swann Perarnau
Browse files

Merge branch '41-names-of-the-nrm-binaries' into 'master'

Resolve "Names of the NRM binaries"

Closes #41

See merge request !81
parents 6d8ae62f a602b464
Pipeline #6524 passed with stages
in 6 minutes and 49 seconds
nrm/*.py nrm/*.py
nrm/coolr/*.py nrm/coolr/*.py
tests/*.py tests/*.py
bin/daemon bin/nrmd
bin/cmd bin/nrm
bin/argo-perf-wrapper bin/nrm-perfwrapper
...@@ -20,7 +20,7 @@ the our container piece on the system for now. ...@@ -20,7 +20,7 @@ the our container piece on the system for now.
## Basic Usage ## Basic Usage
Launch the `daemon`, and use `cmd` to interact with it. Launch `nrmd` and use `nrm` to interact with it.
## Additional Info ## Additional Info
......
...@@ -171,13 +171,14 @@ class CommandLineInterface(object): ...@@ -171,13 +171,14 @@ class CommandLineInterface(object):
logger.error("unexpected message: %r", msg) logger.error("unexpected message: %r", msg)
if outeof and erreof and state == 'exiting': if outeof and erreof and state == 'exiting':
state = 'exit' state = 'exit'
istatus = int(exitmsg.status)
logger.info("command ended: %r", exitmsg) logger.info("command ended: %r", exitmsg)
if os.WIFSIGNALED(exitmsg.status): if os.WIFSIGNALED(istatus):
logger.error("command ended due to signal %s" % logger.error("command ended due to signal %s" %
str(os.WTERMSIG(exitmsg.status))) str(os.WTERMSIG(istatus)))
sys.exit(1) sys.exit(1)
elif os.WIFEXITED(exitmsg.status): elif os.WIFEXITED(istatus):
s = int(os.WTERMSIG(exitmsg.status)) s = int(os.WTERMSIG(istatus))
if s > 0: if s > 0:
logger.debug("command ended with exit code %s" % logger.debug("command ended with exit code %s" %
str(s)) str(s))
......
...@@ -21,5 +21,5 @@ setup( ...@@ -21,5 +21,5 @@ setup(
packages=find_packages(), packages=find_packages(),
install_requires=[], install_requires=[],
scripts=['bin/daemon', 'bin/app', 'bin/cmd', 'bin/argo-perf-wrapper'] scripts=['bin/nrmd', 'bin/app', 'bin/nrm', 'bin/nrm-perfwrapper']
) )
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment