[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.15]: Fix Maintenance::output when called very early

2018-01-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/402662 )

Change subject: Fix Maintenance::output when called very early
..


Fix Maintenance::output when called very early

If a maintenance script is called with --help (or without
required args), this is currently failing, as MediaWikiServices
is only loaded after Maintenance::setup is initially called.
Follows 336454104d1249439e3ff97746de69c5e7b4a5f9.

Change-Id: Ied283d362675b6b98bd3144132a240b432998991
(cherry picked from commit 803a29127ce02734ab2dd83fff2cf716c98eedad)
---
M maintenance/Maintenance.php
1 file changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 07f547f..8bfead3 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -381,11 +381,15 @@
 * @param mixed $channel Unique identifier for the channel. See 
function outputChanneled.
 */
protected function output( $out, $channel = null ) {
-   // Try to periodically flush buffered metrics to avoid OOMs
-   $stats = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
-   if ( $stats->getDataCount() > 1000 ) {
-   MediaWiki::emitBufferedStatsdData( $stats, 
$this->getConfig() );
+   // This is sometimes called very early, before Setup.php is 
included.
+   if ( class_exists( MediaWikiServices::class ) ) {
+   // Try to periodically flush buffered metrics to avoid 
OOMs
+   $stats = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
+   if ( $stats->getDataCount() > 1000 ) {
+   MediaWiki::emitBufferedStatsdData( $stats, 
$this->getConfig() );
+   }
}
+
if ( $this->mQuiet ) {
return;
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ied283d362675b6b98bd3144132a240b432998991
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.15
Gerrit-Owner: Chad 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Parent5446 
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/core[wmf/1.31.0-wmf.15]: Fix Maintenance::output when called very early

2018-01-07 Thread Chad (Code Review) 
Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402662 )

Change subject: Fix Maintenance::output when called very early
..

Fix Maintenance::output when called very early

If a maintenance script is called with --help (or without
required args), this is currently failing, as MediaWikiServices
is only loaded after Maintenance::setup is initially called.
Follows 336454104d1249439e3ff97746de69c5e7b4a5f9.

Change-Id: Ied283d362675b6b98bd3144132a240b432998991
(cherry picked from commit 803a29127ce02734ab2dd83fff2cf716c98eedad)
---
M maintenance/Maintenance.php
1 file changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/62/402662/1

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 07f547f..8bfead3 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -381,11 +381,15 @@
 * @param mixed $channel Unique identifier for the channel. See 
function outputChanneled.
 */
protected function output( $out, $channel = null ) {
-   // Try to periodically flush buffered metrics to avoid OOMs
-   $stats = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
-   if ( $stats->getDataCount() > 1000 ) {
-   MediaWiki::emitBufferedStatsdData( $stats, 
$this->getConfig() );
+   // This is sometimes called very early, before Setup.php is 
included.
+   if ( class_exists( MediaWikiServices::class ) ) {
+   // Try to periodically flush buffered metrics to avoid 
OOMs
+   $stats = 
MediaWikiServices::getInstance()->getStatsdDataFactory();
+   if ( $stats->getDataCount() > 1000 ) {
+   MediaWiki::emitBufferedStatsdData( $stats, 
$this->getConfig() );
+   }
}
+
if ( $this->mQuiet ) {
return;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied283d362675b6b98bd3144132a240b432998991
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.15
Gerrit-Owner: Chad 
Gerrit-Reviewer: Hoo man 

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