Merge "Use WatchedFileHandler to avoid copytruncate."

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',)
 

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',)
 

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',)
 

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',

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',