From d70a85b68668089b97061e6c383d2d07585033ca Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 6 Oct 2016 11:43:43 -0700 Subject: [PATCH] Properly set pidfile for nodepoold Nodepoold wants to know what its pidfile is too so we need to set that in the init scripts after we set DAEMON_ARGS. Without this it will fallback to its default which causes problems when running more than one nodepoold process. Change-Id: I5cc73542ae2499f13fadcfad8f692f5123f62630 --- files/nodepool-deleter.init | 2 +- files/nodepool-launcher.init | 2 +- files/nodepool.init | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/files/nodepool-deleter.init b/files/nodepool-deleter.init index 86cb50c..1f9c5e5 100755 --- a/files/nodepool-deleter.init +++ b/files/nodepool-deleter.init @@ -49,7 +49,7 @@ do_start() start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON --test > /dev/null \ || return 1 start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON -- \ - $DAEMON_ARGS \ + $DAEMON_ARGS -p $PIDFILE \ || return 2 # Add code here, if necessary, that waits for the process to be ready # to handle requests from services started subsequently which depend diff --git a/files/nodepool-launcher.init b/files/nodepool-launcher.init index cd3acaa..77ac4bf 100755 --- a/files/nodepool-launcher.init +++ b/files/nodepool-launcher.init @@ -49,7 +49,7 @@ do_start() start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON --test > /dev/null \ || return 1 start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON -- \ - $DAEMON_ARGS \ + $DAEMON_ARGS -p $PIDFILE \ || return 2 # Add code here, if necessary, that waits for the process to be ready # to handle requests from services started subsequently which depend diff --git a/files/nodepool.init b/files/nodepool.init index 4c6815a..22e1668 100755 --- a/files/nodepool.init +++ b/files/nodepool.init @@ -49,7 +49,7 @@ do_start() start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON --test > /dev/null \ || return 1 start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON -- \ - $DAEMON_ARGS \ + $DAEMON_ARGS -p $PIDFILE \ || return 2 # Add code here, if necessary, that waits for the process to be ready # to handle requests from services started subsequently which depend