From 0f585bef4f7822975cdf86b7b2656b751eb92686 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
---
 manifests/merger.pp | 2 --
 manifests/server.pp | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/manifests/merger.pp b/manifests/merger.pp
index 7aeb038..a6e5d18 100644
--- a/manifests/merger.pp
+++ b/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/manifests/server.pp b/manifests/server.pp
index 261aa73..c0c8f4e 100644
--- a/manifests/server.pp
+++ b/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',