https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114869
Revision: 114869
Author: catrope
Date: 2012-04-12 18:59:48 +0000 (Thu, 12 Apr 2012)
Log Message:
-----------
Add graceful restart capability to the job runner init script. Uses HUP to kill
the jobs-loop.sh process but not its children (the script traps TERM but not
HUP), then just starts a new runner. The children will die eventually
Modified Paths:
--------------
trunk/debs/wikimedia-job-runner/debian/changelog
trunk/debs/wikimedia-job-runner/debian/wikimedia-job-runner.mw-job-runner.init
Modified: trunk/debs/wikimedia-job-runner/debian/changelog
===================================================================
--- trunk/debs/wikimedia-job-runner/debian/changelog 2012-04-12 18:43:03 UTC
(rev 114868)
+++ trunk/debs/wikimedia-job-runner/debian/changelog 2012-04-12 18:59:48 UTC
(rev 114869)
@@ -1,3 +1,9 @@
+wikimedia-job-runner (1.4) lucid-wikimedia; urgency=low
+
+ * Adding graceful restart capability to init script
+
+ -- Roan Kattouw <[email protected]> Thu, 12 Apr 2012 11:58:37 -0700
+
wikimedia-job-runner (1.3) lucid-wikimedia; urgency=low
[ Roan Kattouw ]
Modified:
trunk/debs/wikimedia-job-runner/debian/wikimedia-job-runner.mw-job-runner.init
===================================================================
---
trunk/debs/wikimedia-job-runner/debian/wikimedia-job-runner.mw-job-runner.init
2012-04-12 18:43:03 UTC (rev 114868)
+++
trunk/debs/wikimedia-job-runner/debian/wikimedia-job-runner.mw-job-runner.init
2012-04-12 18:59:48 UTC (rev 114869)
@@ -35,7 +35,7 @@
start-stop-daemon --stop --quiet --pidfile $JR_PID_FILE --retry
60
log_end_msg $?
;;
- restart|reload|force-reload)
+ restart|force-reload)
log_daemon_msg "Restarting MediaWiki job runner"
start-stop-daemon --stop --quiet --pidfile $JR_PID_FILE --retry
60
start-stop-daemon --start --background --quiet \
@@ -44,8 +44,17 @@
--startas $JR_SCRIPT
log_end_msg $?
;;
+ graceful|reload)
+ log_daemon_msg "Gracefully restarting MediaWiki job runner"
+ start-stop-daemon --stop --signal HUP --quiet --pidfile
$JR_PID_FILE --retry 60
+ start-stop-daemon --start --background --quiet \
+ --chuid $JR_USER --nicelevel $JR_NICE \
+ --make-pidfile --pidfile $JR_PID_FILE \
+ --startas $JR_SCRIPT
+ log_end_msg $?
+ ;;
*)
- log_action_msg "Usage: /etc/init.d/mw-job-runner
{start|stop|restart|reload|force-reload}"
+ log_action_msg "Usage: /etc/init.d/mw-job-runner
{start|stop|restart|reload|force-reload|graceful}"
exit 2
;;
esac
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
