Rework the config to use runit logging.

conf/gunicorn_config.py

@@ -2,6 +2,5 @@ bind = 'unix:/tmp/gunicorn.sock'
 workers = 8
 worker_class = 'gevent'
 timeout = 2000
-pidfile = '/tmp/gunicorn.pid'
 logconfig = 'conf/logging.conf'
 pythonpath = '.'

conf/gunicorn_local.py

@@ -3,5 +3,5 @@ workers = 2
 worker_class = 'gevent'
 timeout = 2000
 daemon = False
-logconfig = 'conf/logging_local.conf'
+logconfig = 'conf/logging.conf'
 pythonpath = '.'

conf/http-base.conf

@@ -1,20 +1,8 @@
-log_format logstash_json '{ "@timestamp": "$time_iso8601", '
-                         '"@fields": { '
-                         '"remote_addr": "$remote_addr", '
-                         '"remote_user": "$remote_user", '
-                         '"body_bytes_sent": "$body_bytes_sent", '
-                         '"request_time": "$request_time", '
-                         '"status": "$status", '
-                         '"request": "$request", '
-                         '"request_method": "$request_method", '
-                         '"http_referrer": "$http_referer", '
-                         '"http_user_agent": "$http_user_agent" } }';
-
 types_hash_max_size 2048;
 include /usr/local/nginx/conf/mime.types.default;
 
 default_type application/octet-stream;
-access_log /mnt/logs/nginx.access.log logstash_json;
+access_log /var/log/nginx/nginx.access.log;
 sendfile on;
 
 gzip on;

conf/init/diffsworker/log/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec svlogd /var/log/diffsworker/

conf/init/diffsworker/run

@@ -3,6 +3,6 @@
 echo 'Starting diffs worker'
 
 cd /
-venv/bin/python -m workers.diffsworker --log=/mnt/logs/diffsworker.log
+venv/bin/python -m workers.diffsworker
 
 echo 'Diffs worker exited'

conf/init/dockerfilebuild/log/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec svlogd /var/log/dockerfilebuild/

conf/init/gunicorn/log/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec svlogd /var/log/gunicorn/

conf/init/mklogsdir.sh

@@ -1,4 +0,0 @@
-#! /bin/sh
-
-echo 'Creating logs directory'
-mkdir -p /mnt/logs

conf/init/nginx/log/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec svlogd /var/log/nginx/

conf/init/preplogsdir.sh

@@ -0,0 +1,8 @@
+#! /bin/sh
+
+echo 'Linking config files to logs directory'
+for svc in `ls /etc/service/`
+do
+  mkdir -p /var/log/$svc
+  ln -s /svlogd_config /var/log/$svc/config
+done

conf/init/svlogd_config

@@ -0,0 +1,2 @@
+s100000000
+t86400

conf/init/tutumdocker/log/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec svlogd /var/log/tutumdocker/

conf/init/tutumdocker/run

@@ -92,6 +92,5 @@ if [ "$PORT" ]
 then
   exec docker -d -H 0.0.0.0:$PORT
 else
-
-  docker -d -D -e lxc
+  docker -d -D -e lxc 2>&1
 fi

conf/init/webhookworker/log/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec svlogd -t /var/log/webhookworker/

conf/init/webhookworker/run

@@ -3,6 +3,6 @@
 echo 'Starting webhook worker'
 
 cd /
-venv/bin/python -m workers.webhookworker --log=/mnt/logs/webhookworker.log
+venv/bin/python -m workers.webhookworker
 
 echo 'Webhook worker exited'

conf/logging.conf

@@ -1,38 +1,38 @@
 [loggers]
-keys=root, gunicorn.error, gunicorn.access
+keys=root, gunicorn.error, gunicorn.access, application.profiler
 
 [handlers]
-keys=error_file
+keys=console
 
 [formatters]
 keys=generic
 
 [logger_application.profiler]
 level=DEBUG
-handlers=error_file
+handlers=console
 propagate=0
 qualname=application.profiler
 
 [logger_root]
 level=DEBUG
-handlers=error_file
+handlers=console
 
 [logger_gunicorn.error]
 level=INFO
-handlers=error_file
+handlers=console
 propagate=1
 qualname=gunicorn.error
 
 [logger_gunicorn.access]
 level=INFO
-handlers=error_file
+handlers=console
 propagate=0
 qualname=gunicorn.access
 
-[handler_error_file]
-class=logging.FileHandler
+[handler_console]
+class=StreamHandler
 formatter=generic
-args=('/mnt/logs/application.log',)
+args=(sys.stdout, )
 
 [formatter_generic]
 format=%(asctime)s [%(process)d] [%(levelname)s] [%(name)s] %(message)s

conf/logging_local.conf

@@ -1,39 +0,0 @@
-[loggers]
-keys=root, gunicorn.error, gunicorn.access, application.profiler
-
-[handlers]
-keys=console
-
-[formatters]
-keys=generic
-
-[logger_application.profiler]
-level=DEBUG
-handlers=console
-propagate=0
-qualname=application.profiler
-
-[logger_root]
-level=DEBUG
-handlers=console
-
-[logger_gunicorn.error]
-level=INFO
-handlers=console
-propagate=1
-qualname=gunicorn.error
-
-[logger_gunicorn.access]
-level=INFO
-handlers=console
-propagate=0
-qualname=gunicorn.access
-
-[handler_console]
-class=StreamHandler
-formatter=generic
-args=(sys.stdout, )
-
-[formatter_generic]
-format=%(asctime)s [%(process)d] [%(levelname)s] [%(name)s] %(message)s
-class=logging.Formatter

conf/logrotate/quay-logrotate

@@ -1,41 +0,0 @@
-/mnt/logs/nginx.access.log {
-  daily
-  rotate 7
-  compress
-  delaycompress
-  missingok
-  notifempty
-  create 644 root root
-
-  postrotate
-    kill -USR1 `cat /mnt/logs/nginx.pid`
-  endscript
-}
-
-/mnt/logs/nginx.error.log {
-  daily
-  rotate 7
-  compress
-  delaycompress
-  missingok
-  notifempty
-  create 644 root root
-
-  postrotate
-    kill -USR1 `cat /mnt/logs/nginx.pid`
-  endscript
-}
-
-/mnt/logs/application.log {
-  daily
-  rotate 7
-  compress
-  delaycompress
-  missingok
-  notifempty
-  create 644 ubuntu ubuntu
-
-  postrotate
-    kill -USR1 `cat /mnt/logs/gunicorn.pid`
-  endscript
-}

conf/root-base.conf

@@ -1,5 +1,5 @@
 pid /tmp/nginx.pid;
-error_log /mnt/logs/nginx.error.log;
+error_log /var/log/nginx/nginx.error.log;
 
 events {
     worker_connections 1024;

conf/server-base.conf

@@ -1,5 +1,5 @@
 client_max_body_size 8G;
-client_body_temp_path /mnt/logs/client_body 1 2;
+client_body_temp_path /var/log/nginx/client_body 1 2;
 server_name _;
 
 keepalive_timeout 5;
@@ -20,5 +20,5 @@ location / {
 
     proxy_pass   http://app_server;
     proxy_read_timeout 2000;
-    proxy_temp_path /mnt/logs/proxy_temp 1 2;
+    proxy_temp_path /var/log/nginx/proxy_temp 1 2;
 }