Merge lp:~brad-marshall/charms/trusty/thruk-master/add-debug-options into lp:~canonical-bootstack/charms/trusty/thruk-master/trunk

[Brad Marshall]

Add debug options, and configurable thruk logging paths.

[Peter Sabaini (peter-sabaini)]

lgtm fwiw

[James Hebden (ec0)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-05-05 04:47:26 +0000
+++ config.yaml	2015-08-31 04:51:15 +0000
@@ -34,4 +34,25 @@
 
       If you're running multiple environments with the same services in them
       this allows you to differentiate between them.
+  log-path:
+    default: "/var/log/thruk/thruk.log"
+    type: string
+    description: >
+      The default log path.
+  debug-log:
+    default: false
+    type: boolean
+    description: >
+      Enables debug logging for thruk.
+  debug-log-path:
+    default: "/var/log/thruk/debug.log"
+    type: string
+    description: >
+      The default log path for debugging (if enabled).
+  screen-log:
+    default: false
+    type: boolean
+    description: >
+      Enables debug logging to stderr for thruk - in the default case, this ends
+      up in the apache error logs.
 
 
=== modified file 'hooks/services.py'
--- hooks/services.py	2015-06-24 00:14:14 +0000
+++ hooks/services.py	2015-08-31 04:51:15 +0000
@@ -23,11 +23,15 @@
                 # e.g.: helpers.RequiredConfig('domain', 'auth_key'),
                 #       helpers.MysqlRelation(),
                 thruk_helpers.ThrukMasterRelation(),
+                helpers.RequiredConfig(),
             ],
             'data_ready': [
                 helpers.render_template(
                     source='thruk_local.conf',
                     target='/etc/thruk/thruk_local.conf'),
+                helpers.render_template(
+                    source='log4perl.conf',
+                    target='/etc/thruk/log4perl.conf'),
                 actions.log_start,
                 actions.update_ppa,
                 actions.thruk_set_password,
 
=== added file 'templates/log4perl.conf'
--- templates/log4perl.conf	1970-01-01 00:00:00 +0000
+++ templates/log4perl.conf	2015-08-31 04:51:15 +0000
@@ -0,0 +1,42 @@
+################################
+## Logging Configuration
+#
+# see http://log4perl.sourceforge.net/releases/Log-Log4perl/docs/html/Log/Log4perl/Config.html
+# for other configuration options
+#
+# normal logging, error messages and sent commands
+#log4perl.logger=ALL, ThrukLog
+
+# enable this line to enable debug logging
+# start "./script/thruk_server.pl -d" with -d to enable debugging
+log4perl.logger=ALL, ThrukLog{%- if config['debug-log'] -%}, DebugLog{%- endif -%}{%- if config['screen-log'] -%}, Screen{%- endif %}
+# you have to uncomment the logger definitions below too
+
+# normal log messages
+log4perl.appender.ThrukLog=Log::Dispatch::File
+log4perl.appender.ThrukLog.filename={{config['log-path']}}
+log4perl.appender.ThrukLog.mode=append
+log4perl.appender.ThrukLog.Threshold=INFO
+log4perl.appender.ThrukLog.layout=Log::Log4perl::Layout::PatternLayout
+log4perl.appender.ThrukLog.layout.ConversionPattern=[%d][%H][%p][%c] %m%n
+
+{%- if config['debug-log'] %}
+## debug too
+log4perl.appender.DebugLog=Log::Dispatch::File
+log4perl.appender.DebugLog.filename={{config['debug-log-path']}}
+log4perl.appender.DebugLog.mode=append
+log4perl.appender.DebugLog.Threshold=DEBUG
+log4perl.appender.DebugLog.layout=Log::Log4perl::Layout::PatternLayout
+log4perl.appender.DebugLog.layout.ConversionPattern=[%d][%H][%p][%c] %m%n
+{%- endif %}
+
+{%- if config['screen-log'] %}
+## screen logger
+#log4perl.logger                    = DEBUG, Screen
+log4perl.appender.Screen           = Log::Log4perl::Appender::Screen
+log4perl.appender.Screen.stderr    = 1
+log4perl.appender.Screen.Threshold = DEBUG
+log4perl.appender.Screen.layout    = Log::Log4perl::Layout::PatternLayout
+log4perl.appender.Screen.layout.ConversionPattern = [%d][%H][%p][%c] %m%n
+{%- endif %}
+