From d9121a84efce149361f19ac60ecd6fafe0df46b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 30 Mar 2010 10:55:42 +0000 Subject: [PATCH] log4c config file name needs to be hardcoded to 'log4crc' --- org.glite.lb.logger/config/startup | 8 +------- org.glite.lb.server/config/startup | 8 +------- org.glite.lbjp-common.log/Makefile | 2 +- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/org.glite.lb.logger/config/startup b/org.glite.lb.logger/config/startup index 3ee8a45..12bfc26 100755 --- a/org.glite.lb.logger/config/startup +++ b/org.glite.lb.logger/config/startup @@ -80,13 +80,7 @@ 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 + log4c="LOG4C_RCPATH='$GLITE_LOCATION/etc'" mkdir -p /var/glite/log chown $GLITE_USER /var/glite/log diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup index 24cb9af..4d15f83 100755 --- a/org.glite.lb.server/config/startup +++ b/org.glite.lb.server/config/startup @@ -127,13 +127,7 @@ 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 + log4c="LOG4C_RCPATH='$GLITE_LOCATION/etc'" policy="$GLITE_LOCATION/etc/glite-lb-authz.conf" lcas_log="LCAS_LOG_FILE='/var/log/glite/glite-lb-lcas.log'" diff --git a/org.glite.lbjp-common.log/Makefile b/org.glite.lbjp-common.log/Makefile index aee6bad..4ea1015 100644 --- a/org.glite.lbjp-common.log/Makefile +++ b/org.glite.lbjp-common.log/Makefile @@ -68,7 +68,7 @@ install: compile ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version} ${INSTALL} -m 644 ${top_srcdir}/README ${PREFIX}/share/doc/${package}-${version} mkdir -p ${PREFIX}/etc - ${INSTALL} -m 644 ${top_srcdir}/config/log4crc ${PREFIX}/etc/glite-lb-log4crc + ${INSTALL} -m 644 ${top_srcdir}/config/log4crc ${PREFIX}/etc/log4crc ${INSTALL} -m 644 ${top_srcdir}/config/log4crc ${PREFIX}/share/doc/${package}-${version}/log4crc.example-production ${INSTALL} -m 644 ${top_srcdir}/config/log4crc.debugging ${PREFIX}/share/doc/${package}-${version}/log4crc.example-debugging mkdir -p ${PREFIX}/${libdir} -- 1.8.2.3