From: František Dvořák <valtri@civ.zcu.cz>
Date: Fri, 12 Mar 2010 13:34:53 +0000 (+0000)
Subject: Deployment log4c - using L&B specific config file.
X-Git-Tag: merge_20_2_dst~18
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=2da381bc7639c862e2d17d7d336ca5540e802866;p=jra1mw.git

Deployment log4c - using L&B specific config file.
---

diff --git a/org.glite.lb.logger/config/startup b/org.glite.lb.logger/config/startup
index a6011be..05149e8 100755
--- a/org.glite.lb.logger/config/startup
+++ b/org.glite.lb.logger/config/startup
@@ -15,7 +15,7 @@ GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-$GLITE_LOCATION/var}
 LL_PIDFILE=${LL_PIDFILE:-$GLITE_LOCATION_VAR/glite-lb-logd.pid}
 IL_PIDFILE=${IL_PIDFILE:-$GLITE_LOCATION_VAR/glite-lb-interlogd.pid}
 
-unset creds port
+unset creds port log4c
 
 start_daemon()
 {
@@ -31,7 +31,7 @@ start_daemon()
 		rm -f "$pidfile"
 	fi
 	echo -n "Starting $name ..."
-	su - $GLITE_USER -c "$cmd" && echo " done" || echo " FAILED"
+	su - $GLITE_USER -c "$log4c $cmd" && echo " done" || echo " FAILED"
 }
 
 start()
@@ -64,6 +64,14 @@ start()
 	[ -n "$GLITE_LB_IL_SOCK" ] && sock="--socket $GLITE_LB_IL_SOCK"
 	[ -n "$GLITE_LB_IL_FPREFIX" ] && fprefix="--file-prefix $GLITE_LB_IL_FPREFIX"
 
+	log4c="$GLITE_LOCATION/etc/glite-lb-log4crc"
+	if test -f "$log4c"; then
+		log4c="LOG4C_RCPATH='$log4c'";
+	else
+		echo "$0: WARNING: config file '$log4c' not found." >&2
+		unset log4c
+	fi
+
 	mkdir -p /var/glite/log 
 	chown $GLITE_USER /var/glite/log
         (cd /tmp && ls -f /tmp |grep ^dglogd_sock_ |xargs rm -f)
diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup
index 1488bd1..a156a65 100755
--- a/org.glite.lb.server/config/startup
+++ b/org.glite.lb.server/config/startup
@@ -26,7 +26,7 @@ GLITE_LB_PROXY_FPREFIX=${GLITE_LB_PROXY_FPREFIX:-'/tmp/glite-lbproxy-ilog_events
 IL_PIDFILE=$GLITE_LOCATION_VAR/glite-lb-interlogd.pid
 NOTIF_IL_PIDFILE=$GLITE_LOCATION_VAR/glite-lb-notif-interlogd.pid
 
-unset creds port
+unset creds port log4c
 
 start_daemon()
 {
@@ -42,7 +42,7 @@ start_daemon()
 		rm -f "$pidfile"
 	fi
 	echo -n "Starting $name ..."
-	su - $GLITE_USER -c "$cmd" && echo " done" || echo " FAILED"
+	su - $GLITE_USER -c "$log4c $cmd" && echo " done" || echo " FAILED"
 }
 
 stop_daemon()
@@ -111,6 +111,14 @@ start()
 		fi
 	fi
 
+	log4c="$GLITE_LOCATION/etc/glite-lb-log4crc"
+	if test -f "$log4c"; then
+		log4c="LOG4C_RCPATH='$log4c'";
+	else
+		echo "$0: WARNING: config file '$log4c' not found." >&2
+		unset log4c
+	fi
+
 	[ -z "$GLITE_LB_EXPORT_DUMPDIR" ] && GLITE_LB_EXPORT_DUMPDIR=$GLITE_LOCATION_VAR/dump
 	dumpdir="--dump-prefix $GLITE_LB_EXPORT_DUMPDIR"
 	[ -d "$GLITE_LB_EXPORT_DUMPDIR" ] || mkdir -p "$GLITE_LB_EXPORT_DUMPDIR" && chown $GLITE_USER:$GLITE_GROUP -R "$GLITE_LB_EXPORT_DUMPDIR"
diff --git a/org.glite.lbjp-common.log/Makefile b/org.glite.lbjp-common.log/Makefile
index c026f9a..3fb2e5e 100644
--- a/org.glite.lbjp-common.log/Makefile
+++ b/org.glite.lbjp-common.log/Makefile
@@ -26,7 +26,7 @@ install: compile
 	mkdir -p ${PREFIX}/share/doc/${package}-${version}
 	install -m 644 LICENSE ${PREFIX}/share/doc/${package}-${version}
 	mkdir -p ${PREFIX}/etc
-	install -m 644 log4crc.example ${PREFIX}/etc/log4crc
+	install -m 644 log4crc.example ${PREFIX}/etc/glite-lb-log4crc
 clean:
 	rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/