Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/383040 )
Change subject: mwconf: Use built-in TestSettings.php instead when available
......................................................................
mwconf: Use built-in TestSettings.php instead when available
Change-Id: I7ac0308d472eeee18f137e75f42251e78e70ac28
---
M mediawiki/conf.d/00_dev_settings.php
1 file changed, 29 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/40/383040/1
diff --git a/mediawiki/conf.d/00_dev_settings.php
b/mediawiki/conf.d/00_dev_settings.php
index 064303d..ec76855 100644
--- a/mediawiki/conf.d/00_dev_settings.php
+++ b/mediawiki/conf.d/00_dev_settings.php
@@ -20,27 +20,34 @@
}
$wmgMwLogDir = "$wmgJobWorkspace/log";
-// Debugging: PHP
-error_reporting( -1 );
-ini_set( 'display_errors', 1 );
-
-// Debugging: MediaWiki
-$wgDevelopmentWarnings = true;
-$wgShowDBErrorBacktrace = true;
-$wgShowExceptionDetails = true;
-$wgShowSQLErrors = true;
-$wgDebugRawPage = true; // bug 47960
-
-// Debugging: Logging
-if ( $wgCommandLineMode ) {
- $wgDebugLogFile = "$wmgMwLogDir/mw-debug-cli.log";
+if ( is_file( "$IP/tests/TestSettings.php" ) ) {
+ putenv( 'MW_LOG_DIR', $wmgMwLogDir );
+ require_once "$IP/tests/TestSettings.php";
} else {
- $wgDebugLogFile = "$wmgMwLogDir/mw-debug-www.log";
+ // Compatibility with older MediaWiki branches
+
+ // Debugging: PHP
+ error_reporting( -1 );
+ ini_set( 'display_errors', 1 );
+
+ // Debugging: MediaWiki
+ $wgDevelopmentWarnings = true;
+ $wgShowDBErrorBacktrace = true;
+ $wgShowExceptionDetails = true;
+ $wgShowSQLErrors = true;
+ $wgDebugRawPage = true; // bug 47960
+
+ // Debugging: Logging
+ if ( $wgCommandLineMode ) {
+ $wgDebugLogFile = "$wmgMwLogDir/mw-debug-cli.log";
+ } else {
+ $wgDebugLogFile = "$wmgMwLogDir/mw-debug-www.log";
+ }
+ $wgDebugTimestamps = true;
+ $wgDBerrorLog = "$wmgMwLogDir/mw-dberror.log";
+ $wgDebugLogGroups['ratelimit'] = "$wmgMwLogDir/mw-ratelimit.log";
+ $wgDebugLogGroups['exception'] = "$wmgMwLogDir/mw-exception.log";
+ $wgDebugLogGroups['error'] = "$wmgMwLogDir/mw-error.log";
+ // Back-compat
+ $wgRateLimitLog = $wgDebugLogGroups['ratelimit'];
}
-$wgDebugTimestamps = true;
-$wgDBerrorLog = "$wmgMwLogDir/mw-dberror.log";
-$wgDebugLogGroups['ratelimit'] = "$wmgMwLogDir/mw-ratelimit.log";
-$wgDebugLogGroups['exception'] = "$wmgMwLogDir/mw-exception.log";
-$wgDebugLogGroups['error'] = "$wmgMwLogDir/mw-error.log";
-// Back-compat
-$wgRateLimitLog = $wgDebugLogGroups['ratelimit'];
--
To view, visit https://gerrit.wikimedia.org/r/383040
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ac0308d472eeee18f137e75f42251e78e70ac28
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
