From 2464e007d825ef0ee2e6ddc1a4a0f66a8c9bdf69 Mon Sep 17 00:00:00 2001 From: Jimmy Zelinskie Date: Fri, 3 Jun 2016 15:32:15 -0400 Subject: [PATCH] runit: add dependencies to loggers (#1515) This guarantees that the logger starts after syslog and the process it's logging. --- conf/init/service/buildlogsarchiver/log/run | 9 ++++++++- conf/init/service/buildmanager/log/run | 9 ++++++++- conf/init/service/gcworker/log/run | 9 ++++++++- conf/init/service/gunicorn_registry/log/run | 9 ++++++++- conf/init/service/gunicorn_secscan/log/run | 7 +++++++ conf/init/service/gunicorn_verbs/log/run | 9 ++++++++- conf/init/service/gunicorn_web/log/run | 9 ++++++++- conf/init/service/jwtproxy/log/run | 9 ++++++++- conf/init/service/logrotateworker/log/run | 7 +++++++ conf/init/service/nginx/log/run | 9 ++++++++- conf/init/service/notificationworker/log/run | 9 ++++++++- conf/init/service/queuecleanupworker/log/run | 9 ++++++++- conf/init/service/repositoryactioncounter/log/run | 9 ++++++++- conf/init/service/security_notification_worker/log/run | 9 ++++++++- conf/init/service/securityworker/log/run | 7 +++++++ conf/init/service/service_key_worker/log/run | 7 +++++++ conf/init/service/storagereplication/log/run | 9 ++++++++- 17 files changed, 132 insertions(+), 13 deletions(-) diff --git a/conf/init/service/buildlogsarchiver/log/run b/conf/init/service/buildlogsarchiver/log/run index 3bcd9ba8a..b794e0164 100755 --- a/conf/init/service/buildlogsarchiver/log/run +++ b/conf/init/service/buildlogsarchiver/log/run @@ -1,2 +1,9 @@ #!/bin/sh -exec logger -i -t buildlogsarchiver \ No newline at end of file + +# Ensure dependencies start before the logger +sv start syslog-ng || exit 1 +sv start buildlogsarchiver || exit 1 +sleep 1 + +# Start the logger +exec logger -i -t buildlogsarchiver diff --git a/conf/init/service/buildmanager/log/run b/conf/init/service/buildmanager/log/run index b35e28af9..b0ef6dd0d 100755 --- a/conf/init/service/buildmanager/log/run +++ b/conf/init/service/buildmanager/log/run @@ -1,2 +1,9 @@ #!/bin/sh -exec logger -i -t buildmanager \ No newline at end of file + +# Ensure dependencies start before the logger +sv start syslog-ng || exit 1 +sv start buildmanager || exit 1 +sleep 1 + +# Start the logger +exec logger -i -t buildmanager diff --git a/conf/init/service/gcworker/log/run b/conf/init/service/gcworker/log/run index cf6bdc1d7..3ce5a604f 100755 --- a/conf/init/service/gcworker/log/run +++ b/conf/init/service/gcworker/log/run @@ -1,2 +1,9 @@ #!/bin/sh -exec logger -i -t gcworker \ No newline at end of file + +# Ensure dependencies start before the logger +sv start syslog-ng || exit 1 +sv start gcworker || exit 1 +sleep 1 + +# Start the logger +exec logger -i -t gcworker diff --git a/conf/init/service/gunicorn_registry/log/run b/conf/init/service/gunicorn_registry/log/run index 5b5b37af9..628969a0a 100755 --- a/conf/init/service/gunicorn_registry/log/run +++ b/conf/init/service/gunicorn_registry/log/run @@ -1,2 +1,9 @@ #!/bin/sh -exec logger -i -t gunicorn_registry \ No newline at end of file + +# Ensure dependencies start before the logger +sv start syslog-ng || exit 1 +sv start gunicorn_registry || exit 1 +sleep 1 + +# Start the logger +exec logger -i -t gunicorn_registry diff --git a/conf/init/service/gunicorn_secscan/log/run b/conf/init/service/gunicorn_secscan/log/run index 0f061a86e..f1904e8dd 100755 --- a/conf/init/service/gunicorn_secscan/log/run +++ b/conf/init/service/gunicorn_secscan/log/run @@ -1,2 +1,9 @@ #!/bin/sh + +# Ensure dependencies start before the logger +sv start syslog-ng || exit 1 +sv start gunicorn_secscan || exit 1 +sleep 1 + +# Start the logger exec logger -i -t gunicorn_secscan diff --git a/conf/init/service/gunicorn_verbs/log/run b/conf/init/service/gunicorn_verbs/log/run index d0bc335d7..db4214528 100755 --- a/conf/init/service/gunicorn_verbs/log/run +++ b/conf/init/service/gunicorn_verbs/log/run @@ -1,2 +1,9 @@ #!/bin/sh -exec logger -i -t gunicorn_verbs \ No newline at end of file + +# Ensure dependencies start before the logger +sv start syslog-ng || exit 1 +sv start gunicorn_verbs || exit 1 +sleep 1 + +# Start the logger +exec logger -i -t gunicorn_verbs diff --git a/conf/init/service/gunicorn_web/log/run b/conf/init/service/gunicorn_web/log/run index c96d365a5..feb90ca62 100755 --- a/conf/init/service/gunicorn_web/log/run +++ b/conf/init/service/gunicorn_web/log/run @@ -1,2 +1,9 @@ #!/bin/sh -exec logger -i -t gunicorn_web \ No newline at end of file + +# Ensure dependencies start before the logger +sv start syslog-ng || exit 1 +sv start gunicorn_web || exit 1 +sleep 1 + +# Start the logger +exec logger -i -t gunicorn_web diff --git a/conf/init/service/jwtproxy/log/run b/conf/init/service/jwtproxy/log/run index 0fd684fe2..db2b0f058 100755 --- a/conf/init/service/jwtproxy/log/run +++ b/conf/init/service/jwtproxy/log/run @@ -1,2 +1,9 @@ #!/bin/sh -exec logger -i -t jwtproxy + +# Ensure dependencies start before the logger +sv start syslog-ng || exit 1 +sv start jwtproxy || exit 1 +sleep 1 + +# Start the logger +exec logger -i -t jwtproxy diff --git a/conf/init/service/logrotateworker/log/run b/conf/init/service/logrotateworker/log/run index d8fe0054b..eee1cff15 100755 --- a/conf/init/service/logrotateworker/log/run +++ b/conf/init/service/logrotateworker/log/run @@ -1,2 +1,9 @@ #!/bin/sh + +# Ensure dependencies start before the logger +sv start syslog-ng || exit 1 +sv start logrotateworker || exit 1 +sleep 1 + +# Start the logger exec logger -i -t logrotateworker diff --git a/conf/init/service/nginx/log/run b/conf/init/service/nginx/log/run index 168af6d3e..15c938afa 100755 --- a/conf/init/service/nginx/log/run +++ b/conf/init/service/nginx/log/run @@ -1,2 +1,9 @@ #!/bin/sh -exec logger -i -t nginx \ No newline at end of file + +# Ensure dependencies start before the logger +sv start syslog-ng || exit 1 +sv start nginx || exit 1 +sleep 1 + +# Start the logger +exec logger -i -t nginx diff --git a/conf/init/service/notificationworker/log/run b/conf/init/service/notificationworker/log/run index 49747f3ce..dd0889583 100755 --- a/conf/init/service/notificationworker/log/run +++ b/conf/init/service/notificationworker/log/run @@ -1,2 +1,9 @@ #!/bin/sh -exec logger -i -t notificationworker \ No newline at end of file + +# Ensure dependencies start before the logger +sv start syslog-ng || exit 1 +sv start notificationworker || exit 1 +sleep 1 + +# Start the logger +exec logger -i -t notificationworker diff --git a/conf/init/service/queuecleanupworker/log/run b/conf/init/service/queuecleanupworker/log/run index ec239adfa..1ac2f5d7b 100755 --- a/conf/init/service/queuecleanupworker/log/run +++ b/conf/init/service/queuecleanupworker/log/run @@ -1,2 +1,9 @@ #!/bin/sh -exec logger -i -t queuecleanupworker \ No newline at end of file + +# Ensure dependencies start before the logger +sv start syslog-ng || exit 1 +sv start queuecleanupworker || exit 1 +sleep 1 + +# Start the logger +exec logger -i -t queuecleanupworker diff --git a/conf/init/service/repositoryactioncounter/log/run b/conf/init/service/repositoryactioncounter/log/run index d86d5766f..174043d4b 100755 --- a/conf/init/service/repositoryactioncounter/log/run +++ b/conf/init/service/repositoryactioncounter/log/run @@ -1,2 +1,9 @@ #!/bin/sh -exec logger -i -t repositoryactioncounter \ No newline at end of file + +# Ensure dependencies start before the logger +sv start syslog-ng || exit 1 +sv start repositoryactioncounter || exit 1 +sleep 1 + +# Start the logger +exec logger -i -t repositoryactioncounter diff --git a/conf/init/service/security_notification_worker/log/run b/conf/init/service/security_notification_worker/log/run index 262fed98e..7bf0ce302 100755 --- a/conf/init/service/security_notification_worker/log/run +++ b/conf/init/service/security_notification_worker/log/run @@ -1,2 +1,9 @@ #!/bin/sh -exec logger -i -t securitynotificationworker + +# Ensure dependencies start before the logger +sv start syslog-ng || exit 1 +sv start security_notification_worker || exit 1 +sleep 1 + +# Start the logger +exec logger -i -t security_notification_worker diff --git a/conf/init/service/securityworker/log/run b/conf/init/service/securityworker/log/run index 8de3dfdec..4fa20f75f 100755 --- a/conf/init/service/securityworker/log/run +++ b/conf/init/service/securityworker/log/run @@ -1,2 +1,9 @@ #!/bin/sh + +# Ensure dependencies start before the logger +sv start syslog-ng || exit 1 +sv start securityworker || exit 1 +sleep 1 + +# Start the logger exec logger -i -t securityworker diff --git a/conf/init/service/service_key_worker/log/run b/conf/init/service/service_key_worker/log/run index 410fabb1a..fc6381e09 100755 --- a/conf/init/service/service_key_worker/log/run +++ b/conf/init/service/service_key_worker/log/run @@ -1,2 +1,9 @@ #!/bin/sh + +# Ensure dependencies start before the logger +sv start syslog-ng || exit 1 +sv start service_key_worker || exit 1 +sleep 1 + +# Start the logger exec logger -i -t service_key_worker diff --git a/conf/init/service/storagereplication/log/run b/conf/init/service/storagereplication/log/run index adcd2b63f..c7d4cf659 100755 --- a/conf/init/service/storagereplication/log/run +++ b/conf/init/service/storagereplication/log/run @@ -1,2 +1,9 @@ #!/bin/sh -exec logger -i -t storagereplication \ No newline at end of file + +# Ensure dependencies start before the logger +sv start syslog-ng || exit 1 +sv start storagereplication || exit 1 +sleep 1 + +# Start the logger +exec logger -i -t storagereplication