Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196520
Change subject: WIP: Rotate $wgDebugLogFile log file
......................................................................
WIP: Rotate $wgDebugLogFile log file
Fixes T92594
Bug: T92594
Change-Id: I6af4ead21bf3f867d10cf46055a20f85e5a3d6a4
---
M puppet/modules/mediawiki/manifests/multiwiki.pp
M puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
A
puppet/modules/mediawiki/templates/multiwiki/logrotate.d-mediawiki-debug-log.erb
3 files changed, 23 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/20/196520/1
diff --git a/puppet/modules/mediawiki/manifests/multiwiki.pp
b/puppet/modules/mediawiki/manifests/multiwiki.pp
index 7e0d7e4..ed5da15 100644
--- a/puppet/modules/mediawiki/manifests/multiwiki.pp
+++ b/puppet/modules/mediawiki/manifests/multiwiki.pp
@@ -25,6 +25,16 @@
$settings_root,
) {
+# XXX: How do I get the wiki DB name (mediawiki::db_name) here?
+ $debug_log_file = "/vagrant/logs/mediawiki-{$wgDBname}-debug.log"
+
+ file { "/etc/logrotate.d/mediawiki_${wgDBname}_debug_log":
+ content =>
template('mediawiki/multiwiki/logrotate.d-mediawiki-debug-log.erb'),
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ }
+
File {
owner => 'vagrant',
group => 'www-data',
diff --git
a/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
b/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
index 8f08d68..89bc072 100644
--- a/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
+++ b/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
@@ -22,7 +22,7 @@
include_once __DIR__ . '/LoadWgConf.php';
-$wgDebugLogFile = "/vagrant/logs/mediawiki-{$wgDBname}-debug.log";
+$wgDebugLogFile = '<%= @debug_log_file %>';
foreach(
array_merge(
diff --git
a/puppet/modules/mediawiki/templates/multiwiki/logrotate.d-mediawiki-debug-log.erb
b/puppet/modules/mediawiki/templates/multiwiki/logrotate.d-mediawiki-debug-log.erb
new file mode 100644
index 0000000..58a2982
--- /dev/null
+++
b/puppet/modules/mediawiki/templates/multiwiki/logrotate.d-mediawiki-debug-log.erb
@@ -0,0 +1,12 @@
+# logrotate config for MediaWiki Jobrunner logs
+# This file is managed by Puppet
+
+<%= @debug_log_file %> {
+ daily
+ missingok
+ rotate 2
+ compress
+ notifempty
+ nocreate
+ nomail
+}
--
To view, visit https://gerrit.wikimedia.org/r/196520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6af4ead21bf3f867d10cf46055a20f85e5a3d6a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <mflasc...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
