Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/147669
Change subject: Show STDOUT if STDERR is empty on error
......................................................................
Show STDOUT if STDERR is empty on error
Change-Id: I1115a9e19152ab6f017714e0c0d47894f86fdf1c
---
M redisJobRunnerService
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/jobrunner
refs/changes/69/147669/1
diff --git a/redisJobRunnerService b/redisJobRunnerService
index bc5e4f1..0f590a7 100755
--- a/redisJobRunnerService
+++ b/redisJobRunnerService
@@ -390,6 +390,9 @@
} elseif ( $status && !$status['running'] ) {
if ( $status['exitcode'] != 0 ) {
$error = stream_get_contents(
$procSlot['pipes'][2] );
+ if ( $error == '' ) {
+ $error = stream_get_contents(
$procSlot['pipes'][1] );
+ }
$this->error( "Runner loop $id process
in slot $slot " .
"gave status
'{$status['exitcode']}':\n\t$error." );
$this->incrStats(
'runner-status.error', 1 );
--
To view, visit https://gerrit.wikimedia.org/r/147669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1115a9e19152ab6f017714e0c0d47894f86fdf1c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/jobrunner
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
