From 48b4b9d976b102c6c1ba0c8f795262cd664c43bc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Sun, 28 Mar 2010 22:56:50 +0000 Subject: [PATCH] Fix loggers startup when upgrading from LB 2.0 (released without pidfiles support). --- org.glite.lb.logger/config/startup | 17 +++++++++++++---- org.glite.lb.server/config/startup | 9 +++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/org.glite.lb.logger/config/startup b/org.glite.lb.logger/config/startup index c935727..3ee8a45 100755 --- 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 --- 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() -- 1.8.2.3