From 2b84888c2f355bc5543091636dbb6fc23ef50bd7 Mon Sep 17 00:00:00 2001
From: Jimmy Zelinskie <jimmy.zelinskie+git@gmail.com>
Date: Mon, 27 Jun 2016 14:35:12 -0400
Subject: [PATCH] syslog: have syslog generate timestamps (#1585)

This is the more elegant solution to #1579.
---
 conf/init/service/buildlogsarchiver/log/run            | 4 +---
 conf/init/service/buildmanager/log/run                 | 4 +---
 conf/init/service/gcworker/log/run                     | 4 +---
 conf/init/service/gunicorn_registry/log/run            | 4 +---
 conf/init/service/gunicorn_secscan/log/run             | 4 +---
 conf/init/service/gunicorn_verbs/log/run               | 4 +---
 conf/init/service/gunicorn_web/log/run                 | 4 +---
 conf/init/service/jwtproxy/log/run                     | 4 +---
 conf/init/service/logrotateworker/log/run              | 4 +---
 conf/init/service/nginx/log/run                        | 4 +---
 conf/init/service/notificationworker/log/run           | 4 +---
 conf/init/service/queuecleanupworker/log/run           | 4 +---
 conf/init/service/repositoryactioncounter/log/run      | 4 +---
 conf/init/service/security_notification_worker/log/run | 4 +---
 conf/init/service/securityworker/log/run               | 4 +---
 conf/init/service/service_key_worker/log/run           | 4 +---
 conf/init/service/storagereplication/log/run           | 4 +---
 conf/init/syslog-ng.conf                               | 2 +-
 18 files changed, 18 insertions(+), 52 deletions(-)

diff --git a/conf/init/service/buildlogsarchiver/log/run b/conf/init/service/buildlogsarchiver/log/run
index b1fd324e3..d9f721216 100755
--- a/conf/init/service/buildlogsarchiver/log/run
+++ b/conf/init/service/buildlogsarchiver/log/run
@@ -4,6 +4,4 @@
 sv check syslog-ng > /dev/null || exit 1
 
 # Start the logger
-while read -r msg; do
-  logger -i -t buildlogsarchiver "$msg"
-done
+exec logger -i -t buildlogsarchiver
diff --git a/conf/init/service/buildmanager/log/run b/conf/init/service/buildmanager/log/run
index 336d47107..c20c3756a 100755
--- a/conf/init/service/buildmanager/log/run
+++ b/conf/init/service/buildmanager/log/run
@@ -4,6 +4,4 @@
 sv check syslog-ng > /dev/null || exit 1
 
 # Start the logger
-while read -r msg; do
-  logger -i -t buildmanager "$msg"
-done
+exec logger -i -t buildmanager
diff --git a/conf/init/service/gcworker/log/run b/conf/init/service/gcworker/log/run
index 4b362f781..7c1ee8e2f 100755
--- a/conf/init/service/gcworker/log/run
+++ b/conf/init/service/gcworker/log/run
@@ -4,6 +4,4 @@
 sv check syslog-ng > /dev/null || exit 1
 
 # Start the logger
-while read -r msg; do
-  logger -i -t gcworker "$msg"
-done
+exec logger -i -t gcworker
diff --git a/conf/init/service/gunicorn_registry/log/run b/conf/init/service/gunicorn_registry/log/run
index d38a1b127..97ff2b3b2 100755
--- a/conf/init/service/gunicorn_registry/log/run
+++ b/conf/init/service/gunicorn_registry/log/run
@@ -4,6 +4,4 @@
 sv check syslog-ng > /dev/null || exit 1
 
 # Start the logger
-while read -r msg; do
-  logger -i -t gunicorn_registry "$msg"
-done
+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 2898667ea..a8ced867a 100755
--- a/conf/init/service/gunicorn_secscan/log/run
+++ b/conf/init/service/gunicorn_secscan/log/run
@@ -4,6 +4,4 @@
 sv check syslog-ng > /dev/null || exit 1
 
 # Start the logger
-while read -r msg; do
-  logger -i -t gunicorn_secscan "$msg"
-done
+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 e256276c6..2bf346adc 100755
--- a/conf/init/service/gunicorn_verbs/log/run
+++ b/conf/init/service/gunicorn_verbs/log/run
@@ -4,6 +4,4 @@
 sv check syslog-ng > /dev/null || exit 1
 
 # Start the logger
-while read -r msg; do
-  logger -i -t gunicorn_verbs "$msg"
-done
+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 93656d484..653aa494e 100755
--- a/conf/init/service/gunicorn_web/log/run
+++ b/conf/init/service/gunicorn_web/log/run
@@ -4,6 +4,4 @@
 sv check syslog-ng > /dev/null || exit 1
 
 # Start the logger
-while read -r msg; do
-  logger -i -t gunicorn_web "$msg"
-done
+exec logger -i -t gunicorn_web
diff --git a/conf/init/service/jwtproxy/log/run b/conf/init/service/jwtproxy/log/run
index ce048c9e1..2a7df37e7 100755
--- a/conf/init/service/jwtproxy/log/run
+++ b/conf/init/service/jwtproxy/log/run
@@ -4,6 +4,4 @@
 sv check syslog-ng > /dev/null || exit 1
 
 # Start the logger
-while read -r msg; do
-  logger -i -t jwtproxy "$msg"
-done
+exec logger -i -t jwtproxy
diff --git a/conf/init/service/logrotateworker/log/run b/conf/init/service/logrotateworker/log/run
index 2e0851758..5df84bd21 100755
--- a/conf/init/service/logrotateworker/log/run
+++ b/conf/init/service/logrotateworker/log/run
@@ -4,6 +4,4 @@
 sv check syslog-ng > /dev/null || exit 1
 
 # Start the logger
-while read -r msg; do
-  logger -i -t logrotateworker "$msg"
-done
+exec logger -i -t logrotateworker
diff --git a/conf/init/service/nginx/log/run b/conf/init/service/nginx/log/run
index 5b5eb0680..947aad375 100755
--- a/conf/init/service/nginx/log/run
+++ b/conf/init/service/nginx/log/run
@@ -4,6 +4,4 @@
 sv check syslog-ng > /dev/null || exit 1
 
 # Start the logger
-while read -r msg; do
-  logger -i -t nginx "$msg"
-done
+exec logger -i -t nginx
diff --git a/conf/init/service/notificationworker/log/run b/conf/init/service/notificationworker/log/run
index 10aa8434c..b19329c0c 100755
--- a/conf/init/service/notificationworker/log/run
+++ b/conf/init/service/notificationworker/log/run
@@ -4,6 +4,4 @@
 sv check syslog-ng > /dev/null || exit 1
 
 # Start the logger
-while read -r msg; do
-  logger -i -t notificationworker "$msg"
-done
+exec logger -i -t notificationworker
diff --git a/conf/init/service/queuecleanupworker/log/run b/conf/init/service/queuecleanupworker/log/run
index c5cdb670d..7613c152a 100755
--- a/conf/init/service/queuecleanupworker/log/run
+++ b/conf/init/service/queuecleanupworker/log/run
@@ -4,6 +4,4 @@
 sv check syslog-ng > /dev/null || exit 1
 
 # Start the logger
-while read -r msg; do
-  logger -i -t queuecleanupworker "$msg"
-done
+exec logger -i -t queuecleanupworker
diff --git a/conf/init/service/repositoryactioncounter/log/run b/conf/init/service/repositoryactioncounter/log/run
index e3e8a8a3a..cde5afbd4 100755
--- a/conf/init/service/repositoryactioncounter/log/run
+++ b/conf/init/service/repositoryactioncounter/log/run
@@ -4,6 +4,4 @@
 sv check syslog-ng > /dev/null || exit 1
 
 # Start the logger
-while read -r msg; do
-  logger -i -t repositoryactioncounter "$msg"
-done
+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 8d97830b7..aca57bc0a 100755
--- a/conf/init/service/security_notification_worker/log/run
+++ b/conf/init/service/security_notification_worker/log/run
@@ -4,6 +4,4 @@
 sv check syslog-ng > /dev/null || exit 1
 
 # Start the logger
-while read -r msg; do
-  logger -i -t security_notification_worker "$msg"
-done
+exec logger -i -t security_notification_worker
diff --git a/conf/init/service/securityworker/log/run b/conf/init/service/securityworker/log/run
index ffc0cf6a0..b635fa07f 100755
--- a/conf/init/service/securityworker/log/run
+++ b/conf/init/service/securityworker/log/run
@@ -4,6 +4,4 @@
 sv check syslog-ng > /dev/null || exit 1
 
 # Start the logger
-while read -r msg; do
-  logger -i -t securityworker "$msg"
-done
+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 88b359d27..6e931ea1f 100755
--- a/conf/init/service/service_key_worker/log/run
+++ b/conf/init/service/service_key_worker/log/run
@@ -4,6 +4,4 @@
 sv check syslog-ng > /dev/null || exit 1
 
 # Start the logger
-while read -r msg; do
-  logger -i -t service_key_worker "$msg"
-done
+exec logger -i -t service_key_worker
diff --git a/conf/init/service/storagereplication/log/run b/conf/init/service/storagereplication/log/run
index f224efacf..c0a47f6b1 100755
--- a/conf/init/service/storagereplication/log/run
+++ b/conf/init/service/storagereplication/log/run
@@ -4,6 +4,4 @@
 sv check syslog-ng > /dev/null || exit 1
 
 # Start the logger
-while read -r msg; do
-  logger -i -t storagereplication "$msg"
-done
+exec logger -i -t storagereplication
diff --git a/conf/init/syslog-ng.conf b/conf/init/syslog-ng.conf
index 678d89366..efe963304 100644
--- a/conf/init/syslog-ng.conf
+++ b/conf/init/syslog-ng.conf
@@ -8,7 +8,7 @@
 # First, set some global options.
 options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no);
 	  owner("root"); group("adm"); perm(0640); stats_freq(0);
-	  bad_hostname("^gconfd$");
+	  bad_hostname("^gconfd$"); keep-timestamp(no);
 };
 
 ########################