From 5c92d1906dfc595628c38dbb70d1f017fbd69882 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fabien.boucher@enovance.com>
Date: Wed, 6 May 2015 15:43:51 +0000
Subject: [PATCH] Manage logging configuration files (feature flag)

Add a feature flag to allow this module to manage
its own log configuration files. This feature flag is
set to false currently.

Configuration files for logging come from
system-config/openstack-project. The related system-config
change is Ic5ceb7fb23a8403a31f9db2774ddd900fd838930.

Change-Id: I76851c8672968a7581622cac8ff0062c1f50e0ef
---
 files/gearman-logging.conf | 33 +++++++++++++++++++++++++
 files/logging.conf         | 49 ++++++++++++++++++++++++++++++++++++++
 files/merger-logging.conf  | 49 ++++++++++++++++++++++++++++++++++++++
 manifests/merger.pp        |  8 +++++++
 manifests/server.pp        | 15 ++++++++++++
 5 files changed, 154 insertions(+)
 create mode 100644 files/gearman-logging.conf
 create mode 100644 files/logging.conf
 create mode 100644 files/merger-logging.conf

diff --git a/files/gearman-logging.conf b/files/gearman-logging.conf
new file mode 100644
index 0000000..c662068
--- /dev/null
+++ b/files/gearman-logging.conf
@@ -0,0 +1,33 @@
+[loggers]
+keys=root,gear
+
+[handlers]
+keys=console,normal
+
+[formatters]
+keys=simple
+
+[logger_root]
+level=WARNING
+handlers=console
+
+[logger_gear]
+level=DEBUG
+handlers=normal
+qualname=gear
+
+[handler_console]
+level=WARNING
+class=StreamHandler
+formatter=simple
+args=(sys.stdout,)
+
+[handler_normal]
+level=WARNING
+class=logging.handlers.WatchedFileHandler
+formatter=simple
+args=('/var/log/zuul/gearman-server.log',)
+
+[formatter_simple]
+format=%(asctime)s %(levelname)s %(name)s: %(message)s
+datefmt=
diff --git a/files/logging.conf b/files/logging.conf
new file mode 100644
index 0000000..f4002b3
--- /dev/null
+++ b/files/logging.conf
@@ -0,0 +1,49 @@
+[loggers]
+keys=root,zuul,gerrit,gear
+
+[handlers]
+keys=console,debug,normal
+
+[formatters]
+keys=simple
+
+[logger_root]
+level=WARNING
+handlers=console
+
+[logger_zuul]
+level=DEBUG
+handlers=debug,normal
+qualname=zuul
+
+[logger_gerrit]
+level=DEBUG
+handlers=debug,normal
+qualname=gerrit
+
+[logger_gear]
+level=WARNING
+handlers=debug,normal
+qualname=gear
+
+[handler_console]
+level=WARNING
+class=StreamHandler
+formatter=simple
+args=(sys.stdout,)
+
+[handler_debug]
+level=DEBUG
+class=logging.handlers.WatchedFileHandler
+formatter=simple
+args=('/var/log/zuul/debug.log',)
+
+[handler_normal]
+level=INFO
+class=logging.handlers.WatchedFileHandler
+formatter=simple
+args=('/var/log/zuul/zuul.log',)
+
+[formatter_simple]
+format=%(asctime)s %(levelname)s %(name)s: %(message)s
+datefmt=
diff --git a/files/merger-logging.conf b/files/merger-logging.conf
new file mode 100644
index 0000000..1807f2a
--- /dev/null
+++ b/files/merger-logging.conf
@@ -0,0 +1,49 @@
+[loggers]
+keys=root,zuul,gerrit,gear
+
+[handlers]
+keys=console,debug,normal
+
+[formatters]
+keys=simple
+
+[logger_root]
+level=WARNING
+handlers=console
+
+[logger_zuul]
+level=DEBUG
+handlers=debug,normal
+qualname=zuul
+
+[logger_gerrit]
+level=INFO
+handlers=debug,normal
+qualname=gerrit
+
+[logger_gear]
+level=WARNING
+handlers=debug,normal
+qualname=gear
+
+[handler_console]
+level=WARNING
+class=StreamHandler
+formatter=simple
+args=(sys.stdout,)
+
+[handler_debug]
+level=DEBUG
+class=logging.handlers.WatchedFileHandler
+formatter=simple
+args=('/var/log/zuul/merger-debug.log',)
+
+[handler_normal]
+level=INFO
+class=logging.handlers.WatchedFileHandler
+formatter=simple
+args=('/var/log/zuul/merger.log',)
+
+[formatter_simple]
+format=%(asctime)s %(levelname)s %(name)s: %(message)s
+datefmt=
diff --git a/manifests/merger.pp b/manifests/merger.pp
index a6e5d18..b21f910 100644
--- a/manifests/merger.pp
+++ b/manifests/merger.pp
@@ -16,6 +16,7 @@
 # == Class: zuul::merger
 #
 class zuul::merger (
+  $manage_log_conf = false,
 ) {
   service { 'zuul-merger':
     name       => 'zuul-merger',
@@ -34,6 +35,13 @@ class zuul::merger (
                     File['/var/lib/zuul/git']],
   }
 
+  if $manage_log_conf {
+    file { '/etc/zuul/merger-logging.conf':
+      ensure => present,
+      source => 'puppet:///modules/zuul/merger-logging.conf',
+    }
+  }
+
   include logrotate
   logrotate::file { 'merger.log':
     log     => '/var/log/zuul/merger.log',
diff --git a/manifests/server.pp b/manifests/server.pp
index c744b97..f2a3c55 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -17,6 +17,7 @@
 #
 class zuul::server (
   $layout_dir = '',
+  $manage_log_conf = false,
 ) {
   service { 'zuul':
     name       => 'zuul',
@@ -44,6 +45,20 @@ class zuul::server (
     notify  => Exec['zuul-reload'],
   }
 
+  if $manage_log_conf {
+    file { '/etc/zuul/logging.conf':
+      ensure => present,
+      source => 'puppet:///modules/zuul/logging.conf',
+      notify => Exec['zuul-reload'],
+    }
+
+    file { '/etc/zuul/gearman-logging.conf':
+      ensure => present,
+      source => 'puppet:///modules/zuul/gearman-logging.conf',
+      notify => Exec['zuul-reload'],
+    }
+  }
+
   include logrotate
   logrotate::file { 'zuul.log':
     log     => '/var/log/zuul/zuul.log',