jenkins-bot has submitted this change and it was merged.
Change subject: Less noisy queue consumer logging
......................................................................
Less noisy queue consumer logging
Bug: T151954
Change-Id: Ifc98c04c5778a7a1a63e084fb0f69a6707a6b1a8
---
M Core/QueueConsumers/BaseQueueConsumer.php
1 file changed, 12 insertions(+), 4 deletions(-)
Approvals:
Cdentinger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Core/QueueConsumers/BaseQueueConsumer.php
b/Core/QueueConsumers/BaseQueueConsumer.php
index 5367c51..05b72b9 100644
--- a/Core/QueueConsumers/BaseQueueConsumer.php
+++ b/Core/QueueConsumers/BaseQueueConsumer.php
@@ -101,10 +101,18 @@
}
$timeOk = $this->timeLimit === 0 || time() <=
$startTime + $this->timeLimit;
$countOk = $this->messageLimit === 0 || $processed <
$this->messageLimit;
- $debugMessage = 'Data is ' . ( $data === null ? '' :
'not ' ) . 'null, ' .
- "time limit ($this->timeLimit) is " . ( $timeOk
? 'not ' : '' ) . 'elapsed, ' .
- "message limit ($this->messageLimit) is " . (
$countOk ? 'not ' : '' ) . 'reached.';
- Logger::debug( $debugMessage );
+
+ $debugMessages = array();
+ if ( $data === null ) {
+ $debugMessages[] = 'Queue is empty.';
+ } else if ( !$timeOk ) {
+ $debugMessages[] = "Time limit
($this->timeLimit) is elapsed.";
+ } else if ( !$countOk ) {
+ $debugMessages[] = "Message limit
($this->messageLimit) is reached.";
+ }
+ if ( !empty( $debugMessages ) ) {
+ Logger::debug( implode( ' ', $debugMessages ) );
+ }
}
while( $timeOk && $countOk && $data !== null );
return $processed;
--
To view, visit https://gerrit.wikimedia.org/r/325704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc98c04c5778a7a1a63e084fb0f69a6707a6b1a8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: deployment
Gerrit-Owner: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
