jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/383039 )
Change subject: mwconf: Merge 00_set_debug_log into 00_dev_settings
......................................................................
mwconf: Merge 00_set_debug_log into 00_dev_settings
Bug: T177669
Change-Id: Ief390827da56ee866a1ea0edcecc18b657a7e223
---
M mediawiki/conf.d/00_dev_settings.php
D mediawiki/conf.d/00_set_debug_log.php
2 files changed, 31 insertions(+), 36 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/mediawiki/conf.d/00_dev_settings.php
b/mediawiki/conf.d/00_dev_settings.php
index 6d7c7cb..064303d 100644
--- a/mediawiki/conf.d/00_dev_settings.php
+++ b/mediawiki/conf.d/00_dev_settings.php
@@ -3,6 +3,23 @@
# Snippet coming from integration/jenkins.git:/mediawiki/conf.d/
#
+// Under Apache, there is no Jenkins environement variable. We have to detect
+// the workspace using MediaWiki's include path.
+//
+// Legacy mode was to fetch MediaWiki core directly in the workspace hence
+// $IP is the workspace.
+// The new way is to fetch it under $WORKSPACE/src/mediawiki/core
+if ( $wgCommandLineMode ) {
+ $wmgJobWorkspace = getenv( 'WORKSPACE' );
+} elseif ( preg_match( '%(.*)/src/mediawiki/core%', $IP ) ) {
+ $wmgJobWorkspace = $IP . '/../../..';
+} elseif ( preg_match( '%(.*)/src%', $IP ) ) {
+ $wmgJobWorkspace = $IP . '/..';
+} else {
+ $wmgJobWorkspace = $IP;
+}
+$wmgMwLogDir = "$wmgJobWorkspace/log";
+
// Debugging: PHP
error_reporting( -1 );
ini_set( 'display_errors', 1 );
@@ -13,3 +30,17 @@
$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'];
diff --git a/mediawiki/conf.d/00_set_debug_log.php
b/mediawiki/conf.d/00_set_debug_log.php
deleted file mode 100644
index e3a0727..0000000
--- a/mediawiki/conf.d/00_set_debug_log.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-#
-# Snippet coming from integration/jenkins.git:/mediawiki/conf.d/
-#
-
-// Under Apache, there is no Jenkins environement variable. We have to detect
-// the workspace using MediaWiki's include path.
-//
-// Legacy mode was to fetch MediaWiki core directly in the workspace hence
-// $IP is the workspace.
-// The new way is to fetch it under $WORKSPACE/src/mediawiki/core
-if ( $wgCommandLineMode ) {
- $wmgJobWorkspace = getenv( 'WORKSPACE' );
-} elseif ( preg_match( '%(.*)/src/mediawiki/core%', $IP ) ) {
- $wmgJobWorkspace = $IP . '/../../..';
-} elseif ( preg_match( '%(.*)/src%', $IP ) ) {
- $wmgJobWorkspace = $IP . '/..';
-} else {
- $wmgJobWorkspace = $IP;
-}
-
-// Debugging: Logging
-$wmgMwLogDir = "$wmgJobWorkspace/log";
-
-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'];
--
To view, visit https://gerrit.wikimedia.org/r/383039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ief390827da56ee866a1ea0edcecc18b657a7e223
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
