Filippo Giunchedi has submitted this change and it was merged.
Change subject: statsite: improve restart
......................................................................
statsite: improve restart
unbreak the symmetry between stop and start and handle those from within
statsitectl
Change-Id: I69a46dde7926def8524a49ef32a31801775ec1be
---
M modules/statsite/files/init/init.conf
M modules/statsite/files/init/instance.conf
M modules/statsite/files/statsitectl
3 files changed, 11 insertions(+), 15 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/statsite/files/init/init.conf
b/modules/statsite/files/init/init.conf
index 2e15fd0..fb16637 100644
--- a/modules/statsite/files/init/init.conf
+++ b/modules/statsite/files/init/init.conf
@@ -1,15 +1,10 @@
description "Start statsite instances"
author "Filippo Giunchedi <fili...@wikimedia.org>"
-start on runlevel [2345] or statsite.start
+start on runlevel [2345]
task
script
- for config in /etc/statsite/*.ini; do
- [ -e "$config" ] || break
- name="$(basename $config .ini)"
- start statsite/instance NAME="$name" CONFIG="$config" ||
- status statsite/instance NAME="$name"
- done
+ /sbin/statsitectl start
end script
diff --git a/modules/statsite/files/init/instance.conf
b/modules/statsite/files/init/instance.conf
index 06186a1..dc8051b 100644
--- a/modules/statsite/files/init/instance.conf
+++ b/modules/statsite/files/init/instance.conf
@@ -4,7 +4,6 @@
instance $NAME
-start on runlevel [2345]
stop on runlevel [!2345]
respawn
diff --git a/modules/statsite/files/statsitectl
b/modules/statsite/files/statsitectl
index 50e6fe4..6c42344 100755
--- a/modules/statsite/files/statsitectl
+++ b/modules/statsite/files/statsitectl
@@ -22,19 +22,21 @@
exit 0
;;
start)
- initctl start statsite/init
+ for config in /etc/statsite/*.ini; do
+ instance="$(basename $config .ini)"
+ initctl start statsite/instance NAME="$instance" CONFIG="$config"
+ done
;;
stop)
for config in /etc/statsite/*.ini; do
- instance="$(basename $config .ini)"
- initctl stop statsite/instance NAME="$instance"
+ instance="$(basename $config .ini)"
+ initctl status statsite/instance NAME="$instance" >/dev/null && \
+ initctl stop statsite/instance NAME="$instance"
done
;;
restart)
- for config in /etc/statsite/*.ini; do
- instance="$(basename $config .ini)"
- initctl restart statsite/instance NAME="$instance"
- done
+ $0 stop
+ $0 start
;;
*)
echo >&2 "Usage: ${0##*/} {status|check|start|stop|restart}"
--
To view, visit https://gerrit.wikimedia.org/r/206819
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I69a46dde7926def8524a49ef32a31801775ec1be
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
