jenkins-bot has submitted this change and it was merged. Change subject: Remove out-of-date $wgDebugLogFile and add separate Flow file ......................................................................
Remove out-of-date $wgDebugLogFile and add separate Flow file The $wgDebugLogFile is a remnant I forgot to remove in https://gerrit.wikimedia.org/r/#/c/196520/ Flow log file also has log rotation. Change-Id: Iad6ad88beefb7c034ffa3a30028a70f9272ddf5c --- M LocalSettings.php A puppet/modules/role/files/flow/logrotate.d-mediawiki-Flow M puppet/modules/role/manifests/flow.pp M puppet/modules/role/templates/flow/conf.php.erb 4 files changed, 20 insertions(+), 1 deletion(-) Approvals: Sbisson: Looks good to me, approved jenkins-bot: Verified diff --git a/LocalSettings.php b/LocalSettings.php index 9d3a3fa..af17946 100644 --- a/LocalSettings.php +++ b/LocalSettings.php @@ -28,7 +28,6 @@ $wgShowExceptionDetails = true; $logDir = '/vagrant/logs'; -$wgDebugLogFile = "{$logDir}/mediawiki-debug.log"; foreach ( array( 'exception', 'runJobs', 'JobQueueRedis' ) as $logGroup ) { $wgDebugLogGroups[$logGroup] = "{$logDir}/mediawiki-{$logGroup}.log"; } diff --git a/puppet/modules/role/files/flow/logrotate.d-mediawiki-Flow b/puppet/modules/role/files/flow/logrotate.d-mediawiki-Flow new file mode 100644 index 0000000..e572415 --- /dev/null +++ b/puppet/modules/role/files/flow/logrotate.d-mediawiki-Flow @@ -0,0 +1,11 @@ +# This file is managed by Puppet + +/vagrant/logs/mediawiki-Flow.log + daily + missingok + rotate 7 + compress + notifempty + nocreate + nomail +} diff --git a/puppet/modules/role/manifests/flow.pp b/puppet/modules/role/manifests/flow.pp index ff0e888..8da1501 100644 --- a/puppet/modules/role/manifests/flow.pp +++ b/puppet/modules/role/manifests/flow.pp @@ -11,4 +11,11 @@ priority => $::LOAD_LAST, # load *after* Mantle and Echo browser_tests => '.', } + + file { '/etc/logrotate.d/mediawiki_Flow': + source => 'puppet:///modules/role/flow/logrotate.d-mediawiki-Flow', + owner => 'root', + group => 'root', + mode => '0444', + } } diff --git a/puppet/modules/role/templates/flow/conf.php.erb b/puppet/modules/role/templates/flow/conf.php.erb index ab2d548..7b7f7d7 100644 --- a/puppet/modules/role/templates/flow/conf.php.erb +++ b/puppet/modules/role/templates/flow/conf.php.erb @@ -11,3 +11,5 @@ $wgFlowParsoidTimeout = 100; $wgGroupPermissions['sysop']['flow-create-board'] = true; + +$wgDebugLogGroups['Flow'] = '/vagrant/logs/mediawiki-Flow.log'; -- To view, visit https://gerrit.wikimedia.org/r/203995 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad6ad88beefb7c034ffa3a30028a70f9272ddf5c Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Mattflaschen <mflasc...@wikimedia.org> Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org> Gerrit-Reviewer: Mattflaschen <mflasc...@wikimedia.org> Gerrit-Reviewer: Matthias Mullie <mmul...@wikimedia.org> Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org> Gerrit-Reviewer: Sbisson <sbis...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
