runit: wait for syslog-ng before starting loggers (#1537)

Dockerfile

@@ -85,6 +85,7 @@ RUN apt-get autoremove -y
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 RUN rm -rf grunt
 
+# Set up the init system
 ADD conf/init/copy_config_files.sh /etc/my_init.d/
 ADD conf/init/doupdatelimits.sh /etc/my_init.d/
 ADD conf/init/copy_syslog_config.sh /etc/my_init.d/
@@ -92,9 +93,7 @@ ADD conf/init/create_certs.sh /etc/my_init.d/
 ADD conf/init/runmigration.sh /etc/my_init.d/
 ADD conf/init/syslog-ng.conf /etc/syslog-ng/
 ADD conf/init/zz_boot.sh /etc/my_init.d/
-
 ADD conf/init/service/ /etc/service/
-
 RUN rm -rf /etc/service/syslog-forwarder
 
 # Download any external libs.

conf/init/service/buildlogsarchiver/log/run

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 # Ensure dependencies start before the logger
-sv start syslog-ng || exit 1
+sv check syslog-ng || exit 1
-sv start buildlogsarchiver || exit 1
-sleep 1
 
 # Start the logger
 exec logger -i -t buildlogsarchiver

conf/init/service/buildmanager/log/run

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 # Ensure dependencies start before the logger
-sv start syslog-ng || exit 1
+sv check syslog-ng || exit 1
-sv start buildmanager || exit 1
-sleep 1
 
 # Start the logger
 exec logger -i -t buildmanager

conf/init/service/gcworker/log/run

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 # Ensure dependencies start before the logger
-sv start syslog-ng || exit 1
+sv check syslog-ng || exit 1
-sv start gcworker || exit 1
-sleep 1
 
 # Start the logger
 exec logger -i -t gcworker

conf/init/service/gunicorn_registry/log/run

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 # Ensure dependencies start before the logger
-sv start syslog-ng || exit 1
+sv check syslog-ng || exit 1
-sv start gunicorn_registry || exit 1
-sleep 1
 
 # Start the logger
 exec logger -i -t gunicorn_registry

conf/init/service/gunicorn_secscan/log/run

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 # Ensure dependencies start before the logger
-sv start syslog-ng || exit 1
+sv check syslog-ng || exit 1
-sv start gunicorn_secscan || exit 1
-sleep 1
 
 # Start the logger
 exec logger -i -t gunicorn_secscan

conf/init/service/gunicorn_verbs/log/run

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 # Ensure dependencies start before the logger
-sv start syslog-ng || exit 1
+sv check syslog-ng || exit 1
-sv start gunicorn_verbs || exit 1
-sleep 1
 
 # Start the logger
 exec logger -i -t gunicorn_verbs

conf/init/service/gunicorn_web/log/run

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 # Ensure dependencies start before the logger
-sv start syslog-ng || exit 1
+sv check syslog-ng || exit 1
-sv start gunicorn_web || exit 1
-sleep 1
 
 # Start the logger
 exec logger -i -t gunicorn_web

conf/init/service/jwtproxy/log/run

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 # Ensure dependencies start before the logger
-sv start syslog-ng || exit 1
+sv check syslog-ng || exit 1
-sv start jwtproxy || exit 1
-sleep 1
 
 # Start the logger
 exec logger -i -t jwtproxy

conf/init/service/logrotateworker/log/run

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 # Ensure dependencies start before the logger
-sv start syslog-ng || exit 1
+sv check syslog-ng || exit 1
-sv start logrotateworker || exit 1
-sleep 1
 
 # Start the logger
 exec logger -i -t logrotateworker

conf/init/service/nginx/log/run

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 # Ensure dependencies start before the logger
-sv start syslog-ng || exit 1
+sv check syslog-ng || exit 1
-sv start nginx || exit 1
-sleep 1
 
 # Start the logger
 exec logger -i -t nginx

conf/init/service/notificationworker/log/run

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 # Ensure dependencies start before the logger
-sv start syslog-ng || exit 1
+sv check syslog-ng || exit 1
-sv start notificationworker || exit 1
-sleep 1
 
 # Start the logger
 exec logger -i -t notificationworker

conf/init/service/queuecleanupworker/log/run

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 # Ensure dependencies start before the logger
-sv start syslog-ng || exit 1
+sv check syslog-ng || exit 1
-sv start queuecleanupworker || exit 1
-sleep 1
 
 # Start the logger
 exec logger -i -t queuecleanupworker

conf/init/service/repositoryactioncounter/log/run

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 # Ensure dependencies start before the logger
-sv start syslog-ng || exit 1
+sv check syslog-ng || exit 1
-sv start repositoryactioncounter || exit 1
-sleep 1
 
 # Start the logger
 exec logger -i -t repositoryactioncounter

conf/init/service/security_notification_worker/log/run

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 # Ensure dependencies start before the logger
-sv start syslog-ng || exit 1
+sv check syslog-ng || exit 1
-sv start security_notification_worker || exit 1
-sleep 1
 
 # Start the logger
 exec logger -i -t security_notification_worker

conf/init/service/securityworker/log/run

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 # Ensure dependencies start before the logger
-sv start syslog-ng || exit 1
+sv check syslog-ng || exit 1
-sv start securityworker || exit 1
-sleep 1
 
 # Start the logger
 exec logger -i -t securityworker

conf/init/service/service_key_worker/log/run

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 # Ensure dependencies start before the logger
-sv start syslog-ng || exit 1
+sv check syslog-ng || exit 1
-sv start service_key_worker || exit 1
-sleep 1
 
 # Start the logger
 exec logger -i -t service_key_worker

conf/init/service/storagereplication/log/run

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 # Ensure dependencies start before the logger
-sv start syslog-ng || exit 1
+sv check syslog-ng || exit 1
-sv start storagereplication || exit 1
-sleep 1
 
 # Start the logger
 exec logger -i -t storagereplication

conf/init/service/syslog-ng/check

@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+TESTDATA=$(date)
+logger -t runit "$TESTDATA"
+grep "$TESTDATA" /var/log/syslog > /dev/null