Skip to content

Commit dd35c5e

Browse files
jtimbermandanielsdeleo
authored andcommitted
CHEF-1614, use sleep timers STARTTIME and DIETIME
1 parent b84ecfe commit dd35c5e

6 files changed

Lines changed: 18 additions & 2 deletions

File tree

‎chef/distro/debian/etc/default/chef-server‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ ADAPTER=thin
44
PORT=4000
55
USER=chef
66
GROUP=chef
7+
# Sleep to give daemon enough time to fully start or stop.
8+
STARTTIME=10
9+
DIETIME=5

‎chef/distro/debian/etc/default/chef-server-webui‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@ ADAPTER=thin
44
PORT=4040
55
USER=chef
66
GROUP=chef
7+
# Sleep to give daemon enough time to fully start or stop.
8+
STARTTIME=10
9+
DIETIME=5

‎chef/distro/debian/etc/default/chef-solr‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ LOGFILE=/var/log/chef/solr.log
22
CONFIG=/etc/chef/solr.rb
33
USER=chef
44
GROUP=chef
5+
# Sleep to give daemon enough time to fully start or stop.
6+
DIETIME=5
7+
STARTTIME=5

‎chef/distro/debian/etc/default/chef-solr-indexer‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ LOGFILE=/var/log/chef/solr-indexer.log
22
CONFIG=/etc/chef/solr.rb
33
USER=chef
44
GROUP=chef
5+
# Sleep to give daemon enough time to fully start or stop.
6+
DIETIME=5
7+
STARTTIME=5

‎chef/distro/debian/etc/init.d/chef-server‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ stop_server() {
5757

5858
reload_server() {
5959
stop_server
60+
[ -n "$DIETIME" ] && sleep $DIETIME
6061
start_server
62+
[ -n "$STARTTIME" ] && sleep $STARTTIME
6163
}
6264

6365
case "$1" in
@@ -69,7 +71,7 @@ case "$1" in
6971
exit 0
7072
fi
7173
if start_server ; then
72-
sleep 1
74+
[ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time
7375
if running ; then
7476
log_end_msg 0
7577
else

‎chef/distro/debian/etc/init.d/chef-server-webui‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ stop_server() {
5858

5959
reload_server() {
6060
stop_server
61+
[ -n "$DIETIME" ] && sleep $DIETIME
6162
start_server
63+
[ -n "$STARTTIME" ] && sleep $STARTTIME
6264
}
6365

6466
case "$1" in
@@ -70,7 +72,7 @@ case "$1" in
7072
exit 0
7173
fi
7274
if start_server ; then
73-
sleep 1
75+
[ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time
7476
if running ; then
7577
log_end_msg 0
7678
else

0 commit comments

Comments
 (0)