jenkins-bot has submitted this change and it was merged.
Change subject: Added trim() to json_decode call
......................................................................
Added trim() to json_decode call
Change-Id: I7c12e0892a9c38fb1fd8532717252839848cdbec
---
M redisJobRunnerService
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/redisJobRunnerService b/redisJobRunnerService
index 542b898..5dc2131 100755
--- a/redisJobRunnerService
+++ b/redisJobRunnerService
@@ -800,7 +800,7 @@
}
} elseif ( $status && !$status['running'] ) {
$response = stream_get_contents(
$procSlot['pipes'][1] );
- $result = json_decode( $response ); // an array
if no exceptions happened
+ $result = json_decode( trim( $response ) ); //
an array if no exceptions happened
if ( $status['exitcode'] == 0 && is_array(
$result ) ) {
// If this finished early, lay off of
the queue for a while
if ( ( $cTime - $procSlot['stime'] ) <
$this->srvc->hpMaxTime/2 ) {
--
To view, visit https://gerrit.wikimedia.org/r/151015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7c12e0892a9c38fb1fd8532717252839848cdbec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/jobrunner
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
