opendev/puppet-zuul
Code Issues Proposed changes

Remove tabs from init scripts

Browse Source 
In reviewing the previous change, it became clear that these files were
very tab-happy, which makes reading changes in gertty sad. Clean that
up.

Change-Id: I922fb9b427a4147dc2368577a80f06d212e20c3e
This commit is contained in:
Monty Taylor 2015-11-15 09:08:50 -05:00
parent b03adc90a8
commit 183ef31e75
2 changed files with 176 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
files/zuul-merger.init
View File

@ -50,11 +50,12 @@ do_start()
if [ -f $PIDFILE ]; then if [ -f $PIDFILE ]; then
return 3 return 3
fi fi
start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON --test > /dev/null \ start-stop-daemon \
|| return 1 --start --quiet --pidfile $PIDFILE -c $USER \
start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON -- \ --exec $DAEMON --test > /dev/null || return 1
$DAEMON_ARGS \ start-stop-daemon \
|| return 2 --start --quiet --pidfile $PIDFILE -c $USER \
--exec $DAEMON -- $DAEMON_ARGS || return 2
# Add code here, if necessary, that waits for the process to be ready # Add code here, if necessary, that waits for the process to be ready
# to handle requests from services started subsequently which depend # to handle requests from services started subsequently which depend
# on this one. As a last resort, sleep for some time. # on this one. As a last resort, sleep for some time.
@ -86,7 +87,8 @@ do_reload() {
# restarting (for example, when it is sent a SIGHUP), # restarting (for example, when it is sent a SIGHUP),
# then implement that here. # then implement that here.
# #
start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name zuul-merger start-stop-daemon \
--stop --signal 1 --quiet --pidfile $PIDFILE --name zuul-merger
return 0 return 0
} }

14
files/zuul.init
View File

@ -50,11 +50,12 @@ do_start()
if [ -f $PIDFILE ]; then if [ -f $PIDFILE ]; then
return 3 return 3
fi fi
start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON --test > /dev/null \ start-stop-daemon \
|| return 1 --start --quiet --pidfile $PIDFILE -c $USER \
start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER --exec $DAEMON -- \ --exec $DAEMON --test > /dev/null || return 1
$DAEMON_ARGS \ start-stop-daemon \
|| return 2 --start --quiet --pidfile $PIDFILE -c $USER \
--exec $DAEMON -- $DAEMON_ARGS || return 2
# Add code here, if necessary, that waits for the process to be ready # Add code here, if necessary, that waits for the process to be ready
# to handle requests from services started subsequently which depend # to handle requests from services started subsequently which depend
# on this one. As a last resort, sleep for some time. # on this one. As a last resort, sleep for some time.
@ -111,7 +112,8 @@ do_reload() {
# restarting (for example, when it is sent a SIGHUP), # restarting (for example, when it is sent a SIGHUP),
# then implement that here. # then implement that here.
# #
start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name zuul-server start-stop-daemon \
--stop --signal 1 --quiet --pidfile $PIDFILE --name zuul-server
return 0 return 0
} }