Skip to content

Commit 1b0683b

Browse files
author
Marius Cramer
committed
Improved starter script for hhvm instances
1 parent 1c6da35 commit 1b0683b

File tree

1 file changed

+35
-25
lines changed

1 file changed

+35
-25
lines changed

server/conf/hhvm_starter.master

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,23 @@ NAME=hhvm
1717
do_start()
1818
{
1919
if [ ! -d /var/run/hhvm ]; then
20-
mkdir -p -m0777 /var/run/hhvm
21-
else
22-
chmod 777 /var/run/hhvm
23-
fi
20+
mkdir -p -m0777 /var/run/hhvm
21+
else
22+
chmod 777 /var/run/hhvm
23+
fi
24+
25+
if [[ -e "/var/run/hhvm/hhvm_{SYSTEM_USER}.pid" ]] ; then
26+
kill -0 `cat /var/run/hhvm/hhvm_{SYSTEM_USER}.pid` >/dev/null 2>&1 ;
27+
case "$?" in
28+
0)
29+
return 1
30+
;;
31+
esac
32+
fi
33+
2434
umask 017
25-
sudo -u {SYSTEM_USER} touch /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
26-
/usr/bin/hhvm --mode daemon -vServer.Type=fastcgi --user {SYSTEM_USER} -vServer.FileSocket=/var/run/hhvm/hhvm.{SYSTEM_USER}.sock -vLog.Level=Warning -vLog.UseLogFile=false -vRepo.Central.Path=/var/run/hhvm/hhvm.{SYSTEM_USER}.hhbc -vPidFile=/var/run/hhvm/hhvm_{SYSTEM_USER}.pid & echo $! > /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
35+
sudo -u {SYSTEM_USER} touch /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
36+
/usr/bin/hhvm --mode daemon -vServer.Type=fastcgi --user {SYSTEM_USER} -vServer.FileSocket=/var/run/hhvm/hhvm.{SYSTEM_USER}.sock -vLog.Level=Warning -vLog.UseLogFile=false -vRepo.Central.Path=/var/run/hhvm/hhvm.{SYSTEM_USER}.hhbc -vPidFile=/var/run/hhvm/hhvm_{SYSTEM_USER}.pid & echo $! > /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
2737
}
2838

2939
do_stop()
@@ -35,25 +45,25 @@ do_stop()
3545
}
3646

3747
case "$1" in
38-
start)
39-
do_start
40-
;;
41-
stop)
42-
do_stop
43-
;;
44-
restart|force-reload)
45-
do_stop
46-
case "$?" in
47-
0|1)
48-
do_start
49-
;;
50-
*)
51-
;;
52-
esac
53-
;;
54-
*)
55-
exit 3
56-
;;
48+
start)
49+
do_start
50+
;;
51+
stop)
52+
do_stop
53+
;;
54+
restart|force-reload)
55+
do_stop
56+
case "$?" in
57+
0|1)
58+
do_start
59+
;;
60+
*)
61+
;;
62+
esac
63+
;;
64+
*)
65+
exit 3
66+
;;
5767
esac
5868

5969
:

0 commit comments

Comments
 (0)