From 1b0683b3e4933cd35bd734590c65fefeb4964360 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 30 Apr 2014 05:34:39 -0400
Subject: [PATCH] Improved starter script for hhvm instances
---
server/conf/hhvm_starter.master | 60 +++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/server/conf/hhvm_starter.master b/server/conf/hhvm_starter.master
index 1923043..c64711b 100644
--- a/server/conf/hhvm_starter.master
+++ b/server/conf/hhvm_starter.master
@@ -17,13 +17,23 @@
do_start()
{
if [ ! -d /var/run/hhvm ]; then
- mkdir -p -m0777 /var/run/hhvm
- else
- chmod 777 /var/run/hhvm
- fi
+ mkdir -p -m0777 /var/run/hhvm
+ else
+ chmod 777 /var/run/hhvm
+ fi
+
+ if [[ -e "/var/run/hhvm/hhvm_{SYSTEM_USER}.pid" ]] ; then
+ kill -0 `cat /var/run/hhvm/hhvm_{SYSTEM_USER}.pid` >/dev/null 2>&1 ;
+ case "$?" in
+ 0)
+ return 1
+ ;;
+ esac
+ fi
+
umask 017
- sudo -u {SYSTEM_USER} touch /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
- /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
+ sudo -u {SYSTEM_USER} touch /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
+ /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
}
do_stop()
@@ -35,25 +45,25 @@
}
case "$1" in
- start)
- do_start
- ;;
- stop)
- do_stop
- ;;
- restart|force-reload)
- do_stop
- case "$?" in
- 0|1)
- do_start
- ;;
- *)
- ;;
- esac
- ;;
- *)
- exit 3
- ;;
+ start)
+ do_start
+ ;;
+ stop)
+ do_stop
+ ;;
+ restart|force-reload)
+ do_stop
+ case "$?" in
+ 0|1)
+ do_start
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ *)
+ exit 3
+ ;;
esac
:
--
Gitblit v1.9.1