From efe67a46d7980e93f2fd1eef076d820ab0dff448 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@colivre.coop.br>
Date: Fri, 27 Feb 2015 18:50:43 -0300
Subject: [PATCH] move "is noosfero running?" test to script/production

---
 etc/init.d/noosfero |  2 +-
 script/production   | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/etc/init.d/noosfero b/etc/init.d/noosfero
index c7bcece..9a3c0bd 100755
--- a/etc/init.d/noosfero
+++ b/etc/init.d/noosfero
@@ -123,7 +123,7 @@ do_restart() {
 }
 
 running(){
-  pgrep -u noosfero -f 'thin server' > /dev/null
+  main_script running
 }
 
 case "$1" in
diff --git a/script/production b/script/production
index 7d09553..cc42f9e 100755
--- a/script/production
+++ b/script/production
@@ -84,6 +84,12 @@ environments_loop() {
   fi
 }
 
+do_running() {
+  pids=$(cat tmp/pids/thin.*.pid 2>/dev/null || true)
+  # passes if any of $pids exist, fails otherwise
+  kill -0 $pids > /dev/null 2>&1
+}
+
 case "$ACTION" in
   start|stop)
     do_$ACTION
@@ -100,6 +106,10 @@ case "$ACTION" in
     do_restart
     ;;
 
+  running)
+    do_running
+    ;;
+
   *)
     echo "usage: $0 start|stop|restart|run"
     exit 1
--
libgit2 0.21.2