Fix loggers startup when upgrading from LB 2.0 (released without pidfiles support).

diff --git a/org.glite.lb.logger/config/startup b/org.glite.lb.logger/config/startup
index c935727..3ee8a45 100755 (executable)
--- a/org.glite.lb.logger/config/startup
+++ b/org.glite.lb.logger/config/startup
@@ -117,10 +117,19 @@ killwait()
 
 stop()
 {
-               echo -n Stopping glite-lb-logd ...
-               killwait $LL_PIDFILE
-               echo -n Stopping glite-lb-interlogd ...
-               killwait $IL_PIDFILE
+       echo -n Stopping glite-lb-logd ...
+       killwait $LL_PIDFILE
+       echo -n Stopping glite-lb-interlogd ...
+       killwait $IL_PIDFILE
+
+       # for L&B <= 2.0
+       LC_ALL=C
+       if netstat -an --inet | grep "^tcp .* 0.0.0.0:${GLITE_LB_LOGGER_PORT:-9002} .*LISTEN" >/dev/null 2>&1 ;then
+               killall -9 glite-lb-logd
+       fi
+       if netstat -an --unix | grep "^unix .* LISTEN.* ${GLITE_LB_IL_SOCK:-/tmp/interlogger.sock}$" >/dev/null 2>&1 ;then
+               killall -9 glite-lb-interlogd
+       fi
 }
 
 status()

diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup
index 935f3da..3aba4ab 100755 (executable)
--- a/org.glite.lb.server/config/startup
+++ b/org.glite.lb.server/config/startup
@@ -251,6 +251,15 @@ stop()
        fi
 
        stop_daemon "glite-lb-interlogd" $PROXY_IL_PIDFILE
+
+       # for L&B <= 2.0
+       LC_ALL=C
+       if netstat -an --unix | grep "^unix .* LISTEN.* $GLITE_LB_NOTIF_SOCK" >/dev/null 2>&1 ;then
+               killall -9 glite-lb-notif-interlogd
+       fi
+       if netstat -an --unix | grep "^unix .* LISTEN.* $GLITE_LB_PROXY_SOCK" >/dev/null 2>&1 ;then
+               killall -9 glite-lb-interlogd
+       fi
 }
 
 status()