diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-07-10 14:31:31 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-07-10 14:32:28 +0200 |
| commit | 6db53b43327552cb69daf3da7422e1f3ab4e20f1 (patch) | |
| tree | e01cc78295c50dc1a8cbdd022c6317d607d09465 | |
| parent | Merge pull request #6368 (diff) | |
| parent | Add BITCOIND_SIGTERM_TIMEOUT to OpenRC init scripts (diff) | |
| download | discoin-6db53b43327552cb69daf3da7422e1f3ab4e20f1.tar.xz discoin-6db53b43327552cb69daf3da7422e1f3ab4e20f1.zip | |
Merge pull request #6401
8c44e63 Add BITCOIND_SIGTERM_TIMEOUT to OpenRC init scripts (Florian Schmaus)
| -rw-r--r-- | contrib/init/bitcoind.openrc | 6 | ||||
| -rw-r--r-- | contrib/init/bitcoind.openrcconf | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/contrib/init/bitcoind.openrc b/contrib/init/bitcoind.openrc index a94f03680..eda1a96fb 100644 --- a/contrib/init/bitcoind.openrc +++ b/contrib/init/bitcoind.openrc @@ -32,7 +32,11 @@ required_files="${BITCOIND_CONFIGFILE}" start_stop_daemon_args="-u ${BITCOIND_USER} \ -N ${BITCOIND_NICE} -w 2000" pidfile="${BITCOIND_PIDFILE}" -retry=60 + +# The retry schedule to use when stopping the daemon. Could be either +# a timeout in seconds or multiple signal/timeout pairs (like +# "SIGKILL/180 SIGTERM/300") +retry="${BITCOIND_SIGTERM_TIMEOUT}" depend() { need localmount net diff --git a/contrib/init/bitcoind.openrcconf b/contrib/init/bitcoind.openrcconf index d8d7f5833..0cbff6d30 100644 --- a/contrib/init/bitcoind.openrcconf +++ b/contrib/init/bitcoind.openrcconf @@ -25,3 +25,9 @@ # Additional options (avoid -conf and -datadir, use flags above) BITCOIND_OPTS="-disablewallet" +# The timeout in seconds OpenRC will wait for bitcoind to terminate +# after a SIGTERM has been raised. +# Note that this will be mapped as argument to start-stop-daemon's +# '--retry' option, which means you can specify a retry schedule +# here. For more information see man 8 start-stop-daemon. +BITCOIND_SIGTERM_TIMEOUT=60 |