From: Jiří Škrábal <nykolas@ics.muni.cz>
Date: Thu, 17 Mar 2005 09:47:42 +0000 (+0000)
Subject: - do not care about interlogger in lbproxy startup script
X-Git-Tag: glite-deployment-lb_R_1_2_2~25
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=db2b603dd8adf6caa1a34d41cd0fa421479ae3c8;p=jra1mw.git

- do not care about interlogger in lbproxy startup script
---

diff --git a/org.glite.lb.proxy/config/startup b/org.glite.lb.proxy/config/startup
index 397dcd2..a03dca8 100755
--- a/org.glite.lb.proxy/config/startup
+++ b/org.glite.lb.proxy/config/startup
@@ -14,8 +14,6 @@ GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-${GLITE_LOCATION}/var}
 [ -n "$GLITE_LB_PROXY_PIDFILE" ] && pidfile=$GLITE_LB_PROXY_PIDFILE ||
 	pidfile=$GLITE_LOCATION_VAR/glite-lb-proxy.pid
 
-unset creds
-
 start()
 {
 	if test -z "$GLITE_USER" ;then
@@ -24,19 +22,6 @@ start()
 		return 1
 	fi
 
-	[ -n "$GLITE_HOST_CERT" -a -n "$GLITE_HOST_KEY" ] &&
-		creds="-c $GLITE_HOST_CERT -k $GLITE_HOST_KEY"
-
-	if test -z "$creds"; then
-		if su - $GLITE_USER -c "test -r /etc/grid-security/hostkey.pem -a -r /etc/grid-security/hostcert.pem"; then
-			echo "$0: WARNING: /etc/grid-security/hostkey.pem readable by $GLITE_USER"
-			creds="-c /etc/grid-security/hostcert.pem -k /etc/grid-security/hostkey.pem"
-		fi
-	fi
-
-
-	[ -z "$creds" ] && echo $0: WARNING: No credentials specified. Using default lookup which is dangerous. >&2
-
 	#
 	# XXX: Starting proxy only with default socket paths
 	#
@@ -45,18 +30,10 @@ start()
         --proxy-il-sock=/tmp/glite-lbproxy-ilog.sock \
 		--proxy-il-fprefix=/tmp/glite-lbproxy-ilog_events \
 		-i $pidfile " && echo " done" || echo " FAILED"
-
-	echo -n Starting glite-lb-interlogd ...
-	su - $GLITE_USER -c "$GLITE_LOCATION/bin/glite-lb-interlogd \
-		-f /tmp/glite-lbproxy-ilog_events -s /tmp/glite-lbproxy-ilog.sock
-		$creds" && echo " done" || echo " FAILED"
 }
 
 stop()
 {
-	echo -n Stopping glite-lb-interlogd ...
-	killall glite-lb-interlogd
-	echo done
 	if [ -f $pidfile ]; then
 		pid=`cat $pidfile`
 		kill $pid
@@ -80,13 +57,6 @@ stop()
 
 status()
 {
-	if netstat -an --unix | grep "^unix .* LISTEN.* /tmp/glite-lbproxy-ilog.sock$" >/dev/null 2>&1 ;then
-		echo glite-lb-interlogd running
-	else
-		echo glite-lb-interlogd not running
-		return 1
-	fi
-
 	if [ -f $pidfile ]; then
 		pid=`cat $pidfile`
 		if ps p $pid >/dev/null 2>&1; then