Merge branch 'master' into 4904-arv-web

[arvados.git] / services / arv-web / arv-web.py

diff --git a/services/arv-web/arv-web.py b/services/arv-web/arv-web.py
index 7dbd304adcc4b29a4dd5308da58a2534ae91a79e..e7315585a02d407e33ee25b2317a7206c1aeb51d 100755 (executable)
--- a/services/arv-web/arv-web.py
+++ b/services/arv-web/arv-web.py
@@ -156,8 +156,6 @@ class ArvWeb(object):
             self.stop_docker()
 
             logger.info("Starting Docker container %s", docker_image)
-            ciddir = tempfile.mkdtemp()
-            cidfilepath = os.path.join(ciddir, "cidfile")
             self.cid = subprocess.check_output(["docker", "run",
                                                 "--detach=true",
                                                 "--publish=%i:80" % (self.port),
@@ -246,6 +244,9 @@ def main(argv):
         arvweb.run()
     except arvados.errors.ArgumentError as e:
         logger.error(e)
+        return 1
+
+    return 0
 
 if __name__ == '__main__':
-    main(sys.argv[1:])
+    sys.exit(main(sys.argv[1:]))