Merge "Amphora-agent should log to a distinct location"

elements/amphora-agent/element-deps

@@ -1,4 +1,5 @@
 dib-init-system
+install-static
 package-installs
 pip-and-virtualenv
 source-repositories

elements/amphora-agent/init-scripts/systemd/amphora-agent.service

@@ -7,6 +7,8 @@ Wants=syslog.service
 ExecStart=/usr/local/bin/amphora-agent --config-file /etc/octavia/amphora-agent.conf
 KillMode=mixed
 Restart=always
+ExecStartPost=/bin/sh -c "echo $MAINPID > /var/run/amphora-agent.pid"
+PIDFile=/var/run/amphora-agent.pid
 
 [Install]
 WantedBy=multi-user.target

elements/amphora-agent/init-scripts/upstart/amphora-agent.conf

@@ -7,3 +7,12 @@ respawn
 respawn limit 2 2
 
 exec amphora-agent --config-file /etc/octavia/amphora-agent.conf
+
+post-start script
+    PID=`status amphora-agent | egrep -oi '([0-9]+)$' | head -n1`
+    echo $PID > /var/run/amphora-agent.pid
+end script
+
+post-stop script
+    rm -f /var/run/amphora-agent.pid
+end script

elements/amphora-agent/static/etc/logrotate.d/amphora-agent

@@ -0,0 +1,12 @@
+/var/log/amphora-agent.log {
+    daily
+    rotate 10
+    missingok
+    notifempty
+    compress
+    delaycompress
+    sharedscripts
+    postrotate
+        kill -s SIGUSR1 $(cat /var/run/amphora-agent.pid)
+    endscript
+}

octavia/cmd/agent.py

@@ -77,8 +77,8 @@ def main():
         'ca_certs': CONF.amphora_agent.agent_server_ca,
         'cert_reqs': True,
         'preload_app': True,
-        'accesslog': '-',
+        'accesslog': '/var/log/amphora-agent.log',
-        'errorlog': '-',
+        'errorlog': '/var/log/amphora-agent.log',
         'loglevel': 'debug',
     }
     AmphoraAgent(server_instance.app, options).run()