[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: A log was a false positive

2017-03-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342674 )

Change subject: A log was a false positive
..


A log was a false positive

This log message says an extension is requested but missing; in the case
the config says not to install this extension, not to trigger this log
message.

Change-Id: I49025006500a012e72caf58e3c0a365d89d87269
---
M src/MediaWikiFarm.php
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Seb35: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index 00cc059..89e60aa 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -1338,9 +1338,11 @@
} elseif( $value !== false && ( $status = 
$this->detectLoadingMechanism( $type, $name ) ) ) {
$value = true;
} elseif( $key != 'ExtensionMediaWikiFarm' ) {
+   if( $value ) {
+   $this->log[] = "Requested but missing 
$type $name for wiki {$this->variables['$WIKIID']} in version 
{$this->variables['$VERSION']}";
+   }
$value = false;
unset( $this->configuration['extensions'][$key] 
);
-   $this->log[] = "Requested but missing $type 
$name for wiki {$this->variables['$WIKIID']} in version 
{$this->variables['$VERSION']}";
} else {
$status = $ExtensionRegistry ? 
'wfLoadExtension' : 'require_once';
}

-- 
To view, visit https://gerrit.wikimedia.org/r/342674
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I49025006500a012e72caf58e3c0a365d89d87269
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Seb35 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: A log was a false positive

2017-03-14 Thread Seb35 (Code Review) 
Seb35 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342674 )

Change subject: A log was a false positive
..

A log was a false positive

This log message says an extension is requested but missing; in the case
the config says not to install this extension, not to trigger this log
message.

Change-Id: I49025006500a012e72caf58e3c0a365d89d87269
---
M src/MediaWikiFarm.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm 
refs/changes/74/342674/1

diff --git a/src/MediaWikiFarm.php b/src/MediaWikiFarm.php
index 00cc059..89e60aa 100644
--- a/src/MediaWikiFarm.php
+++ b/src/MediaWikiFarm.php
@@ -1338,9 +1338,11 @@
} elseif( $value !== false && ( $status = 
$this->detectLoadingMechanism( $type, $name ) ) ) {
$value = true;
} elseif( $key != 'ExtensionMediaWikiFarm' ) {
+   if( $value ) {
+   $this->log[] = "Requested but missing 
$type $name for wiki {$this->variables['$WIKIID']} in version 
{$this->variables['$VERSION']}";
+   }
$value = false;
unset( $this->configuration['extensions'][$key] 
);
-   $this->log[] = "Requested but missing $type 
$name for wiki {$this->variables['$WIKIID']} in version 
{$this->variables['$VERSION']}";
} else {
$status = $ExtensionRegistry ? 
'wfLoadExtension' : 'require_once';
}

-- 
To view, visit https://gerrit.wikimedia.org/r/342674
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I49025006500a012e72caf58e3c0a365d89d87269
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits