From: František Dvořák Date: Wed, 17 Mar 2010 09:38:35 +0000 (+0000) Subject: Fix proxy interlogger startup (due to latest changes). Some polishing. X-Git-Tag: glite-jobid-api-c_R_1_0_2_1~83 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=7d4f29d76b37de7cc9aee0e9cff0a2bbb99fe76e;p=jra1mw.git Fix proxy interlogger startup (due to latest changes). Some polishing. --- diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup index a156a65..6c09089 100755 --- a/org.glite.lb.server/config/startup +++ b/org.glite.lb.server/config/startup @@ -23,7 +23,7 @@ GLITE_LB_TYPE=${GLITE_LB_TYPE:-'server'} # server, proxy, both GLITE_LB_PROXY_SOCK=${GLITE_LB_PROXY_SOCK:-'/tmp/glite-lbproxy-ilog.sock'} GLITE_LB_PROXY_FPREFIX=${GLITE_LB_PROXY_FPREFIX:-'/tmp/glite-lbproxy-ilog_events'} -IL_PIDFILE=$GLITE_LOCATION_VAR/glite-lb-interlogd.pid +PROXY_IL_PIDFILE=$GLITE_LOCATION_VAR/glite-lb-proxy-interlogd.pid NOTIF_IL_PIDFILE=$GLITE_LOCATION_VAR/glite-lb-notif-interlogd.pid unset creds port log4c @@ -193,7 +193,7 @@ start() start_daemon glite-lb-notif-interlogd "$NOTIF_IL_PIDFILE" "$GLITE_LOCATION/bin/glite-lb-notif-interlogd \ -f $GLITE_LB_NOTIF_FPREFIX -s $GLITE_LB_NOTIF_SOCK \ -i $NOTIF_IL_PIDFILE -M 10485760 \ - $creds $GLITE_LB_NOTIF_OTHER_OPTIONS" + $creds $GLITE_LB_NOTIF_IL_OTHER_OPTIONS" else echo Warning: glite-lb-notif-interlogd not installed, LB notifications will not work fi @@ -208,10 +208,10 @@ start() if test x"$GLITE_LB_TYPE" = x"proxy" -o x"$GLITE_LB_TYPE" = x"both" ; then if test -x $GLITE_LOCATION/bin/glite-lb-interlogd; then - start_daemon "glite-lb-interlog for proxy" "$IL_PIDFILE" "$GLITE_LOCATION/bin/glite-lb-interlogd \ + start_daemon "glite-lb-interlog for proxy" "$PROXY_IL_PIDFILE" "$GLITE_LOCATION/bin/glite-lb-interlogd \ -f $GLITE_LB_PROXY_FPREFIX -s $GLITE_LB_PROXY_SOCK \ - -i $IL_PIDFILE \ - $creds $GLITE_LB_PREFIX_OTHER_OPTIONS" + -i $PROXY_IL_PIDFILE \ + $creds $GLITE_LB_PROXY_IL_OTHER_OPTIONS" else echo Warning: glite-lb-interlogd not installed, logging to LB proxy will not work fi @@ -227,7 +227,7 @@ stop() stop_daemon "glite-jp-importer" $jp_importer_pidfile fi - stop_daemon "glite-lb-interlogd" $IL_PIDFILE + stop_daemon "glite-lb-interlogd" $PROXY_IL_PIDFILE } status() @@ -235,7 +235,7 @@ status() retval=0 status_daemon "glite-lb-notif-interlogd" "$NOTIF_IL_PIDFILE" || retval=1 - status_daemon "glite-lb-interlogd for proxy" "$IL_PIDFILE" || retval=1 + status_daemon "glite-lb-interlogd for proxy" "$PROXY_IL_PIDFILE" || retval=1 status_daemon "glite-lb-bkserverd" "$BK_PIDFILE" || retval=1 if test x"$GLITE_LB_EXPORT_ENABLED" = x"true"; then