Fix fork failures (#56)

* Also ignore OSError when waiting for supervisor * Run container with --init
liquidinvestigations · Jul 18, 2019 · c75b3f3 · c75b3f3
1 parent d76cf2c
commit c75b3f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/bin/docker.sh b/bin/docker.sh
@@ -43,6 +43,7 @@ DOCKERGROUPID="$(getent group docker | cut -d: -f3)"
 set -x
 docker run --detach \
   --restart always \
+  --init \
   --name $name \
   --env USERID=$USERID \
   --env GROUPID=$GROUPID \

diff --git a/cluster.py b/cluster.py
@@ -474,8 +474,8 @@ def wait_for_supervisor():
         try:
             supervisor_pid()
             break
-        except subprocess.CalledProcessError as e:
-            log.warning(e)
+        except (OSError, subprocess.CalledProcessError) as e:
+            log.warning('waiting for supervisor: %s', e)
         sleep(2)
     else:
         raise RuntimeError('supervisord did not start')