[gentoo-commits] proj/openrc:master commit in: sh/, man/, /

[gentoo-commits] proj/openrc:master commit in: sh/, man/, /

[William Hubbs]

commit:     e372f97bebd4866633ad56aa5d5b1ae59fa88118
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed May 13 19:47:35 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed May 13 21:10:08 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=e372f97b

Fix the s6 handling

This changes the default s6 service directory to /var/svc.d, also
it changes the code to work with the individual services instead of
forcing a rescan when a service is started or stopped.

 man/openrc-run.8 |  2 +-
 s6-guide.md      |  4 ++--
 sh/s6.sh         | 34 ++++++++++++++++++----------------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/man/openrc-run.8 b/man/openrc-run.8
index 259d23f..0a9f5bc 100644
--- a/man/openrc-run.8
+++ b/man/openrc-run.8
@@ -114,7 +114,7 @@ in this release is S6 from Skarnet software. To use this, set
 supervisor=s6.
 .It Ar s6_service_path
 The path to the s6 service directory if you are monitoring this service
-with S6. The default is /etc/svc.d/${RC_SVCNAME}.
+with S6. The default is /var/svc.d/${RC_SVCNAME}.
 .It Ar s6_svwait_options_start
 The options to pass to s6-svwait when starting the service via s6.
 .It Ar s6_svwait_options_stop

diff --git a/s6-guide.md b/s6-guide.md
index 4a37a9c..9a09e32 100644
--- a/s6-guide.md
+++ b/s6-guide.md
@@ -37,10 +37,10 @@ s6_service_path - the path to the s6 service directory
 s6_svwait_options_start - the options to pass to s6-svwait when starting
 s6_svwait_options_stop - the options to pass to s6-svwait when stopping.
 
-The s6_service_path variable defaults to /etc/svc.d/${RC_SVCNAME} if it
+The s6_service_path variable defaults to /var/svc.d/${RC_SVCNAME} if it
 is not set in the service script. For example, if you want a service
 script called /etc/init.d/foobar to use s6 to monitor its daemon, the s6
-service should be the directory /etc/svc.d/foobar.
+service should be the directory /var/svc.d/foobar.
 
 See the documentation for s6 for more information about s6 service
 directories.

diff --git a/sh/s6.sh b/sh/s6.sh
index 780beab..01527b6 100644
--- a/sh/s6.sh
+++ b/sh/s6.sh
@@ -2,7 +2,7 @@
 # Copyright (c) 2015 William Hubbs <w.d.hubbs@gmail.com>
 # Released under the 2-clause BSD license.
 
-[ -z "${s6_service_path}" ] && s6_service_path="/etc/svc.d/${RC_SVCNAME}"
+[ -z "${s6_service_path}" ] && s6_service_path="/var/svc.d/${RC_SVCNAME}"
 
 s6_start()
 {
@@ -10,16 +10,17 @@ s6_start()
 		eerror "${s6_service_path} does not exist."
  	return 1
  fi
-	local rc
+	s6_service_link="${RC_SVCDIR}/s6-scan/${s6_service_path##*/}"
 	ebegin "Starting ${name:-$RC_SVCNAME}"
-	ln -sf "${s6_service_path}" "${RC_SVCDIR}"/s6-scan
-	s6-svscanctl -an "${RC_SVCDIR}"/s6-scan
-	rc=$?
+	ln -sf "${s6_service_path}" "${s6_service_link}"
+	s6-svc -u "${s6_service_link}"
 	if [ -n "$s6_svwait_options_start" ]; then
-		s6-svwait ${s6_svwait_options_start} "${s6_service_path}"
-		rc=$?
+		s6-svwait ${s6_svwait_options_start} "${s6_service_link}"
 	fi
-	eend $rc "Failed to start $RC_SVCNAME"
+	sleep 1.5
+	set -- $(s6-svstat "${s6_service_link}")
+	[ "$1" = "up" ]
+	eend $? "Failed to start $RC_SVCNAME"
 }
 
 s6_stop()
@@ -28,19 +29,20 @@ s6_stop()
 		eerror "${s6_service_path} does not exist."
  	return 1
  fi
-	local rc
+	s6_service_link="${RC_SVCDIR}/s6-scan/${s6_service_path##*/}"
 	ebegin "Stopping ${name:-$RC_SVCNAME}"
-	rm -rf "${RC_SVCDIR}/s6-scan/${s6_service_path##*/}"
-	s6-svscanctl -an "${RC_SVCDIR}"/s6-scan
-	rc=$? 
+	s6-svc -d "${s6_service_link}"
 	if [ -n "$s6_svwait_options_stop" ]; then
-		s6-svwait ${s6_svwait_options_stop} "${s6_service_path}"
-		rc=$?
+		s6-svwait ${s6_svwait_options_stop} "${s6_service_link}"
 	fi
-	eend $rc "Failed to stop $RC_SVCNAME"
+	sleep 1.5
+	set -- $(s6-svstat "${s6_service_link}")
+	[ "$1" = "down" ] && rm -fr "${s6_service_link}"
+	eend $? "Failed to stop $RC_SVCNAME"
 }
 
 s6_status()
 {
-	s6-svstat "${s6_service_path}"
+	s6_service_link="${RC_SVCDIR}/s6-scan/${s6_service_path##*/}"
+	s6-svstat "${s6_service_link}"
 }

[gentoo-commits] proj/openrc:master commit in: sh/, man/, /

[William Hubbs]

commit:     b79d058f162d8b49ccc968744e7cb1b7a7ba729c
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu May 14 16:40:29 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu May 14 16:40:29 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=b79d058f

s6: Use s6-svc -Dd to stop services

This allows us to get rid of the sleep call in the stop function. Also,
we set a configurable timeout value for stopping daemons.

 man/openrc-run.8 |  5 +++--
 s6-guide.md      | 20 ++++++--------------
 sh/s6.sh         |  6 +-----
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/man/openrc-run.8 b/man/openrc-run.8
index 0a9f5bc..f08ad79 100644
--- a/man/openrc-run.8
+++ b/man/openrc-run.8
@@ -117,8 +117,9 @@ The path to the s6 service directory if you are monitoring this service
 with S6. The default is /var/svc.d/${RC_SVCNAME}.
 .It Ar s6_svwait_options_start
 The options to pass to s6-svwait when starting the service via s6.
-.It Ar s6_svwait_options_stop
-The options to pass to s6-svwait when stopping the service via s6.
+.It Ar s6_service_timeout_stop
+The amount of time, in milliseconds, s6-svc should wait for the service
+to go down when stopping the service. The default is 10000.
 .It Ar start_stop_daemon_args
 List of arguments passed to start-stop-daemon when starting the daemon.
 .It Ar command

diff --git a/s6-guide.md b/s6-guide.md
index 9a09e32..63c63de 100644
--- a/s6-guide.md
+++ b/s6-guide.md
@@ -33,22 +33,14 @@ supervisor=s6
 Several other variables affect s6 services. They are documented on the
 openrc-run man page, but I will list them here for convenience:
 
-s6_service_path - the path to the s6 service directory
-s6_svwait_options_start - the options to pass to s6-svwait when starting
-s6_svwait_options_stop - the options to pass to s6-svwait when stopping.
-
-The s6_service_path variable defaults to /var/svc.d/${RC_SVCNAME} if it
-is not set in the service script. For example, if you want a service
-script called /etc/init.d/foobar to use s6 to monitor its daemon, the s6
-service should be the directory /var/svc.d/foobar.
+s6_service_path - the path to the s6 service directory. The default is
+/var/svc.d/$RC_SVCNAME.
 
-See the documentation for s6 for more information about s6 service
-directories.
+s6_svwait_options_start - the options to pass to s6-svwait when starting
+the service. If this is not set, s6-svwait will not be called.
 
-The s6_svwait_options_* variables set command line options to pass to
-s6-svwait when starting or stopping the s6 service. These can be very
-useful for waiting for s6 services to signal when they are up, timing out
-when an s6 service doesn't come up, etc.
+s6_service_timeout_stop - the amount of time, in milliseconds, s6-svc
+should wait for a service to go down when stopping.
 
 This is very early support, so feel free to file bugs if you have
 issues.

diff --git a/sh/s6.sh b/sh/s6.sh
index a99fd5b..99aba3f 100644
--- a/sh/s6.sh
+++ b/sh/s6.sh
@@ -31,11 +31,7 @@ s6_stop()
  fi
 	s6_service_link="${RC_SVCDIR}/s6-scan/${s6_service_path##*/}"
 	ebegin "Stopping ${name:-$RC_SVCNAME}"
-	s6-svc -d "${s6_service_link}"
-	if [ -n "$s6_svwait_options_stop" ]; then
-		s6-svwait ${s6_svwait_options_stop} "${s6_service_link}"
-	fi
-	sleep 1.5
+	s6-svc -Dd -T ${s6_service_timeout_stop:-10000} "${s6_service_link}"
 	set -- $(s6-svstat "${s6_service_link}")
 	[ "$1" = "down" ]
 	eend $? "Failed to stop $RC_SVCNAME"

[gentoo-commits] proj/openrc:master commit in: sh/, man/, /

[William Hubbs]

commit:     e805c74d31113c75058d860588e83bca120decf6
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Nov 16 21:35:35 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov 16 21:35:35 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=e805c74d

s6 supervisor fixes

Add the ability to force-kill a service if it does not go down
successfully. Also, adjust the default wait time for an s6 service to go
down to 60 seconds.

 man/openrc-run.8 |  5 ++++-
 s6-guide.md      |  4 ++++
 sh/s6.sh         | 20 +++++++++++++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/man/openrc-run.8 b/man/openrc-run.8
index 471f63e5..3f4f7e81 100644
--- a/man/openrc-run.8
+++ b/man/openrc-run.8
@@ -111,9 +111,12 @@ The path to the s6 service directory if you are monitoring this service
 with S6. The default is /var/svc.d/${RC_SVCNAME}.
 .It Ar s6_svwait_options_start
 The options to pass to s6-svwait when starting the service via s6.
+.It Ar s6_force_kill
+Should we force-kill this service if s6_service_timeout_stop expires
+but the service doesn't go down during shutdown? The default is yes.
 .It Ar s6_service_timeout_stop
 The amount of time, in milliseconds, s6-svc should wait for the service
-to go down when stopping the service. The default is 10000.
+to go down when stopping the service. The default is 60000.
 .It Ar start_stop_daemon_args
 List of arguments passed to start-stop-daemon when starting the daemon.
 .It Ar command

diff --git a/s6-guide.md b/s6-guide.md
index 52262b3c..bcc3ac28 100644
--- a/s6-guide.md
+++ b/s6-guide.md
@@ -39,6 +39,10 @@ s6_service_path - the path to the s6 service directory. The default is
 s6_svwait_options_start - the options to pass to s6-svwait when starting
 the service. If this is not set, s6-svwait will not be called.
 
+s6_force_kill - Should we try to force kill this service if the
+s6_service_timeout_stop timeout expires when shutting down this service?
+The default is yes.
+
 s6_service_timeout_stop - the amount of time, in milliseconds, s6-svc
 should wait for a service to go down when stopping.
 

diff --git a/sh/s6.sh b/sh/s6.sh
index d1b9c103..33c478ad 100644
--- a/sh/s6.sh
+++ b/sh/s6.sh
@@ -12,6 +12,20 @@
 
 [ -z "${s6_service_path}" ] && s6_service_path="/var/svc.d/${RC_SVCNAME}"
 
+_s6_force_kill() {
+	local pid
+	s6_service_link="${RC_SVCDIR}/s6-scan/${s6_service_path##*/}"
+	pid="${3%)}"
+	[ -z "${pid}" ] && return 0
+	if kill -0 "${pid}" 2> /dev/null; then
+		ewarn "Sending DOWN & KILL for ${RC_SVCNAME}"
+		s6-svc -dk "${s6_service_link}"
+		sleep 1
+		kill -0 "${pid}" 2>/dev/null && return 1
+	fi
+	return 0
+}
+
 s6_start()
 {
 	if [ ! -d "${s6_service_path}" ]; then
@@ -41,7 +55,11 @@ s6_stop()
  fi
 	s6_service_link="${RC_SVCDIR}/s6-scan/${s6_service_path##*/}"
 	ebegin "Stopping ${name:-$RC_SVCNAME}"
-	s6-svc -wD -d -T ${s6_service_timeout_stop:-10000} "${s6_service_link}"
+	s6-svc -d -wD -T ${s6_service_timeout_stop:-60000} "${s6_service_link}"
+	set -- $(s6-svstat "${s6_service_link}")
+	[ "$1" = "up" ] && 
+		yesno "${s6_force_kill:-yes}" &&
+			_s6_force_kill "$@"
 	set -- $(s6-svstat "${s6_service_link}")
 	[ "$1" = "down" ]
 	eend $? "Failed to stop ${name:-$RC_SVCNAME}"