Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/359923 )
Change subject: Services now exit(0) when catching a signal
......................................................................
Services now exit(0) when catching a signal
When managing the services with upstart or systemd, they would send
SIGTERM or SIGKILL. The services ends up exiting with non zero which
flags an error.
exit( 0 ), regardless of the signal that got caught.
Bug: T168044
Change-Id: I9b6c291f21f0b480547aea9eb9b96cbfc2f0bd44
---
M redisJobChronService
M redisJobRunnerService
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/jobrunner
refs/changes/23/359923/1
diff --git a/redisJobChronService b/redisJobChronService
index c17cac8..8da929d 100755
--- a/redisJobChronService
+++ b/redisJobChronService
@@ -24,7 +24,7 @@
// Setup signal handlers...
$handlerFunc = function( $signo ) {
print "Caught signal ($signo)\n";
- exit( 128 + $signo );
+ exit( 0 );
};
$ok = pcntl_signal( SIGHUP, $handlerFunc )
&& pcntl_signal( SIGINT, $handlerFunc )
diff --git a/redisJobRunnerService b/redisJobRunnerService
index 263a744..5f6d315 100755
--- a/redisJobRunnerService
+++ b/redisJobRunnerService
@@ -31,7 +31,7 @@
$handlerFunc = function( $signo ) use ( $pipeline ) {
print "Caught signal ($signo)\n";
$pipeline->terminateSlots();
- exit( 128 + $signo );
+ exit( 0 );
};
$ok = pcntl_signal( SIGHUP, $handlerFunc )
&& pcntl_signal( SIGINT, $handlerFunc )
--
To view, visit https://gerrit.wikimedia.org/r/359923
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b6c291f21f0b480547aea9eb9b96cbfc2f0bd44
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/jobrunner
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
