From: František Dvořák <valtri@civ.zcu.cz>
Date: Thu, 13 Dec 2012 15:54:35 +0000 (+0000)
Subject: Fix conrestart in startup scripts with multimple deamons, fix major upgrade (moving... 
X-Git-Tag: merge_32_head_take_5_dst~4
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=33725154051a6e37244d53cef73c93823aa65a94;p=jra1mw.git

Fix conrestart in startup scripts with multimple deamons, fix major upgrade (moving old pidfiles to new places if needed).
---

diff --git a/org.glite.lb.harvester/config/startup b/org.glite.lb.harvester/config/startup
index ea32b73..ce64e06 100755
--- a/org.glite.lb.harvester/config/startup
+++ b/org.glite.lb.harvester/config/startup
@@ -197,6 +197,9 @@ cleanup()
 	fi
 }
 
+# upgrade from L&B <= 4.0.1
+if [ -f /var/glite/glite-lb-harvester.pid -a ! -f $pidfile ]; then mv /var/glite/glite-lb-harvester.pid /var/run/glite 2>/dev/null; fi
+
 case x$1 in
 	xstart)	start;;
 	xstop)	stop;;
diff --git a/org.glite.lb.logger/config/startup b/org.glite.lb.logger/config/startup
index 087789d..69a4cd2 100755
--- a/org.glite.lb.logger/config/startup
+++ b/org.glite.lb.logger/config/startup
@@ -199,13 +199,17 @@ status()
 	return $retval
 }
 
+# upgrade from L&B <= 4.0.1
+if [ -f /var/glite/glite-lb-logd.pid -a ! -f $LL_PIDFILE ]; then mv /var/glite/glite-lb-logd.pid /var/run/glite 2>/dev/null; fi
+if [ -f /var/glite/glite-lb-interlogd.pid -a ! -f $IL_PIDFILE ]; then mv /var/glite/glite-lb-interlogd.pid /var/run/glite 2>/dev/null; fi
+
 case x$1 in
 	xstart)	start;;
 	xstop)	stop;;
 	xrestart|xforce-reload) stop; start;;
 	xstatus) status;;
 	xcondrestart|xtry-restart)
-		status >/dev/null 2>&1 || exit 0
+		status 2>/dev/null | grep 'running as' >/dev/null 2>&1 || exit 0
 		stop; start
 		;;
 	x*)	echo usage: $0 start,stop,restart,status >&2
diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup
index 8d1d227..1921644 100755
--- a/org.glite.lb.server/config/startup
+++ b/org.glite.lb.server/config/startup
@@ -330,13 +330,18 @@ status()
 	return $retval
 }
 
+# upgrade from L&B <= 4.0.1
+if [ -f /var/glite/glite-lb-bkserverd.pid -a ! -f $BK_PIDFILE ]; then mv /var/glite/glite-lb-bkserverd.pid /var/run/glite 2>/dev/null; fi
+if [ -f /var/glite/glite-lb-notif-interlogd.pid -a ! -f $NOTIF_IL_PIDFILE ]; then mv /var/glite/glite-lb-notif-interlogd.pid /var/run/glite 2>/dev/null; fi
+if [ -f /var/glite/glite-lb-proxy-interlogd.pid -a ! -f $PROXY_IL_PIDFILE ]; then mv /var/glite/glite-lb-proxy-interlogd.pid /var/run/glite 2>/dev/null; fi
+
 case x$1 in
 	xstart)	start;;
 	xstop)	stop;;
 	xrestart|xforce-reload) stop; start;;
 	xstatus) status;;
 	xcondrestart|xtry-restart)
-		status >/dev/null 2>&1 || exit 0
+		status 2>/dev/null | grep 'running as' >/dev/null 2>&1 || exit 0
 		stop; start
 		;;
 	x*)	echo usage: $0 start,stop,restart,status >&2