From ddb23eeb7bab17d382d33ce843df11312580e1d3 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Tue, 27 May 2014 15:03:38 -0700
Subject: [PATCH] Use WatchedFileHandler to avoid copytruncate.

Python logging has a WatchedFileHandler which will do the correct thing
for logrotate when copytruncate is not used. Do this to avoid having
multiple copies of the same log in place. Also, this should avoid a race
where log data is lost between copying and truncating done by logrotate.

Change-Id: Idbbc7869004a03b8f19cfbd81ad07f5584ce1964
---
 modules/openstack_project/files/zuul/gearman-logging.conf | 2 +-
 modules/openstack_project/files/zuul/logging.conf         | 4 ++--
 modules/openstack_project/files/zuul/merger-logging.conf  | 4 ++--
 modules/zuul/manifests/merger.pp                          | 2 --
 modules/zuul/manifests/server.pp                          | 3 ---
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/modules/openstack_project/files/zuul/gearman-logging.conf b/modules/openstack_project/files/zuul/gearman-logging.conf
index c75f7b3ae6..c662068b62 100644
--- a/modules/openstack_project/files/zuul/gearman-logging.conf
+++ b/modules/openstack_project/files/zuul/gearman-logging.conf
@@ -24,7 +24,7 @@ args=(sys.stdout,)
 
 [handler_normal]
 level=WARNING
-class=logging.FileHandler
+class=logging.handlers.WatchedFileHandler
 formatter=simple
 args=('/var/log/zuul/gearman-server.log',)
 
diff --git a/modules/openstack_project/files/zuul/logging.conf b/modules/openstack_project/files/zuul/logging.conf
index 756eee525d..62ee24e878 100644
--- a/modules/openstack_project/files/zuul/logging.conf
+++ b/modules/openstack_project/files/zuul/logging.conf
@@ -34,13 +34,13 @@ args=(sys.stdout,)
 
 [handler_debug]
 level=DEBUG
-class=logging.FileHandler
+class=logging.handlers.WatchedFileHandler
 formatter=simple
 args=('/var/log/zuul/debug.log',)
 
 [handler_normal]
 level=INFO
-class=logging.FileHandler
+class=logging.handlers.WatchedFileHandler
 formatter=simple
 args=('/var/log/zuul/zuul.log',)
 
diff --git a/modules/openstack_project/files/zuul/merger-logging.conf b/modules/openstack_project/files/zuul/merger-logging.conf
index dd77ed1a04..1807f2a427 100644
--- a/modules/openstack_project/files/zuul/merger-logging.conf
+++ b/modules/openstack_project/files/zuul/merger-logging.conf
@@ -34,13 +34,13 @@ args=(sys.stdout,)
 
 [handler_debug]
 level=DEBUG
-class=logging.FileHandler
+class=logging.handlers.WatchedFileHandler
 formatter=simple
 args=('/var/log/zuul/merger-debug.log',)
 
 [handler_normal]
 level=INFO
-class=logging.FileHandler
+class=logging.handlers.WatchedFileHandler
 formatter=simple
 args=('/var/log/zuul/merger.log',)
 
diff --git a/modules/zuul/manifests/merger.pp b/modules/zuul/manifests/merger.pp
index 7aeb0384c2..a6e5d183e7 100644
--- a/modules/zuul/manifests/merger.pp
+++ b/modules/zuul/manifests/merger.pp
@@ -39,7 +39,6 @@ class zuul::merger (
     log     => '/var/log/zuul/merger.log',
     options => [
       'compress',
-      'copytruncate',
       'missingok',
       'rotate 30',
       'daily',
@@ -51,7 +50,6 @@ class zuul::merger (
     log     => '/var/log/zuul/merger-debug.log',
     options => [
       'compress',
-      'copytruncate',
       'missingok',
       'rotate 30',
       'daily',
diff --git a/modules/zuul/manifests/server.pp b/modules/zuul/manifests/server.pp
index 261aa73e20..c0c8f4ed3a 100644
--- a/modules/zuul/manifests/server.pp
+++ b/modules/zuul/manifests/server.pp
@@ -35,7 +35,6 @@ class zuul::server (
     log     => '/var/log/zuul/zuul.log',
     options => [
       'compress',
-      'copytruncate',
       'missingok',
       'rotate 30',
       'daily',
@@ -47,7 +46,6 @@ class zuul::server (
     log     => '/var/log/zuul/debug.log',
     options => [
       'compress',
-      'copytruncate',
       'missingok',
       'rotate 30',
       'daily',
@@ -59,7 +57,6 @@ class zuul::server (
     log     => '/var/log/zuul/gearman-server.log',
     options => [
       'compress',
-      'copytruncate',
       'missingok',
       'rotate 7',
       'daily',