Commit f85f04bb authored by Swann Perarnau's avatar Swann Perarnau

Merge branch 'small-fixes' into 'master'

Bugfixes for recently implemented features

See merge request !10
parents 7786fb66 dec31967
......@@ -108,7 +108,7 @@ class DownstreamApplication(object):
self.progress.start()
# retrieve our container uuid
self.container_uuid = os.environ.get('container')
self.container_uuid = os.environ.get('ARGO_CONTAINER_UUID')
if self.container_uuid is None:
logger.error("missing container uuid")
exit(1)
......
......@@ -49,11 +49,11 @@ class ContainerManager(object):
"/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin")
environ['AC_APP_NAME'] = manifest.name
environ['AC_METADATA_URL'] = "localhost"
environ['container'] = 'argo'
logger.info("run: environ: %r", environ)
# create container
container_name = request['uuid']
environ['ARGO_CONTAINER_UUID'] = container_name
logger.info("creating container %s", container_name)
self.nodeos.create(container_name, allocation)
logger.info("created container %s", container_name)
......
......@@ -86,7 +86,7 @@ class Daemon(object):
outcb = partial(self.do_children_io, container_uuid, 'stdout')
errcb = partial(self.do_children_io, container_uuid, 'stderr')
container.process.stdout.read_until_close(outcb, outcb)
container.process.stderr.read_until_close(errcb, outcb)
container.process.stderr.read_until_close(errcb, errcb)
elif command == 'kill':
logger.info("asked to kill container: %r", msg)
response = self.container_manager.kill(msg['uuid'])
......
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