Mattflaschen has uploaded a new change for review. https://gerrit.wikimedia.org/r/203995
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 M puppet/modules/role/manifests/flow.pp M puppet/modules/role/templates/flow/conf.php.erb 3 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/95/203995/1 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/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 5899b9a..83d3c0e 100644 --- a/puppet/modules/role/templates/flow/conf.php.erb +++ b/puppet/modules/role/templates/flow/conf.php.erb @@ -9,3 +9,5 @@ $wgFlowParsoidURL = 'http://localhost:<%= scope['mediawiki::parsoid::port'] %>'; $wgFlowParsoidPrefix = 'localhost'; $wgFlowParsoidTimeout = 100; + +$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: newchange Gerrit-Change-Id: Iad6ad88beefb7c034ffa3a30028a70f9272ddf5c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Mattflaschen <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
