projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
5414: Control initializer load order using require_relative instead of alphabetical...
[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..482a5776d92d08306ef8327339200418b887c723 100755
(executable)
--- a/
services/arv-web/arv-web.py
+++ b/
services/arv-web/arv-web.py
@@
-5,8
+5,9
@@
# See http://doc.arvados.org/user/topics/arv-web.html
import arvados
# See http://doc.arvados.org/user/topics/arv-web.html
import arvados
+from arvados.safeapi import ThreadSafeApiCache
import subprocess
import subprocess
-from arvados_fuse import Operations,
SafeApi,
CollectionDirectory
+from arvados_fuse import Operations, CollectionDirectory
import tempfile
import os
import llfuse
import tempfile
import os
import llfuse
@@
-32,7
+33,7
@@
class ArvWeb(object):
self.override_docker_image = docker_image
self.port = port
self.evqueue = Queue.Queue()
self.override_docker_image = docker_image
self.port = port
self.evqueue = Queue.Queue()
- self.api =
SafeApi(arvados.config
)
+ self.api =
ThreadSafeApiCache(arvados.config.settings()
)
if arvados.util.group_uuid_pattern.match(project) is None:
raise arvados.errors.ArgumentError("Project uuid is not valid")
if arvados.util.group_uuid_pattern.match(project) is None:
raise arvados.errors.ArgumentError("Project uuid is not valid")
@@
-156,8
+157,6
@@
class ArvWeb(object):
self.stop_docker()
logger.info("Starting Docker container %s", docker_image)
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),
self.cid = subprocess.check_output(["docker", "run",
"--detach=true",
"--publish=%i:80" % (self.port),
@@
-246,6
+245,9
@@
def main(argv):
arvweb.run()
except arvados.errors.ArgumentError as e:
logger.error(e)
arvweb.run()
except arvados.errors.ArgumentError as e:
logger.error(e)
+ return 1
+
+ return 0
if __name__ == '__main__':
if __name__ == '__main__':
-
main(sys.argv[1:]
)
+
sys.exit(main(sys.argv[1:])
)