Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/313897
Change subject: Make Thumbor logging configuration closer to what production's
will be
......................................................................
Make Thumbor logging configuration closer to what production's will be
Refs T145632
Change-Id: I3b0ba25f1e63b4395b825c03c6197ebbfc789bd0
---
M puppet/modules/thumbor/manifests/init.pp
M puppet/modules/thumbor/templates/20-thumbor-logging.conf.erb
2 files changed, 19 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/97/313897/1
diff --git a/puppet/modules/thumbor/manifests/init.pp
b/puppet/modules/thumbor/manifests/init.pp
index 563cc2c..79fb13a 100644
--- a/puppet/modules/thumbor/manifests/init.pp
+++ b/puppet/modules/thumbor/manifests/init.pp
@@ -126,11 +126,11 @@
}
file { $cfg_dir:
- ensure => directory,
+ ensure => directory,
}
file { $log_dir:
- ensure => directory,
+ ensure => directory,
}
file { "${cfg_dir}/10-thumbor.conf":
@@ -146,22 +146,22 @@
}
file { "${cfg_dir}/20-thumbor-logging.conf":
- ensure => present,
- group => 'thumbor',
- content => template('thumbor/20-thumbor-logging.conf.erb'),
- mode => '0640',
- require => [
+ ensure => present,
+ group => 'thumbor',
+ content => template('thumbor/20-thumbor-logging.conf.erb'),
+ mode => '0640',
+ require => [
File[$cfg_dir, $log_dir],
Group['thumbor'],
],
}
file { "${cfg_dir}/20-thumbor-wikimedia.conf":
- ensure => present,
- group => 'thumbor',
- content => template('thumbor/20-thumbor-wikimedia.conf.erb'),
- mode => '0640',
- require => [
+ ensure => present,
+ group => 'thumbor',
+ content => template('thumbor/20-thumbor-wikimedia.conf.erb'),
+ mode => '0640',
+ require => [
File[$cfg_dir],
Group['thumbor'],
],
diff --git a/puppet/modules/thumbor/templates/20-thumbor-logging.conf.erb
b/puppet/modules/thumbor/templates/20-thumbor-logging.conf.erb
index 2d770f9..2dea41c 100644
--- a/puppet/modules/thumbor/templates/20-thumbor-logging.conf.erb
+++ b/puppet/modules/thumbor/templates/20-thumbor-logging.conf.erb
@@ -24,23 +24,18 @@
'flag': 'exclude'
},
'silentcontext': {
- '()': ContextFilter
+ '()': ContextFilter,
}
},
'handlers': {
- 'error': {
+ 'errorstream': {
'level': 'ERROR',
- 'class': 'logging.handlers.TimedRotatingFileHandler',
+ 'class': 'logging.StreamHandler',
'formatter': 'default',
- 'filename': '<%= @log_dir %>/thumbor.error.log',
- 'interval': 1,
- 'when': 'D',
- 'backupCount': 4,
- 'encoding': 'utf8',
- 'delay': False,
'filters': ['context', '404exclude']
},
- 'rootdebug': {
+ 'debugstream': {
+ 'level': 'DEBUG',
'class': 'logging.StreamHandler',
'formatter': 'default',
'filters': ['silentcontext']
@@ -73,12 +68,7 @@
'loggers': {
'': {
'level': 'DEBUG',
- 'handlers': ['rootdebug']
- },
- 'thumbor': {
- 'level': 'DEBUG',
- 'handlers': ['debug', 'error', 'http404']
+ 'handlers': ['debug', 'debugstream', 'errorstream', 'http404']
}
-
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/313897
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b0ba25f1e63b4395b825c03c6197ebbfc789bd0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gilles <gdu...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
