From: Jan Pospíšil <honik@ntc.zcu.cz>
Date: Mon, 15 Mar 2010 10:00:27 +0000 (+0000)
Subject: Not to be confused by the word example
X-Git-Tag: merge_20_2_dst~3
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=0d1f22af928b67436d93705d7da053f7148a2f63;p=jra1mw.git

Not to be confused by the word example
---

diff --git a/org.glite.lbjp-common.log/Makefile b/org.glite.lbjp-common.log/Makefile
index 5001755..7ea9140 100644
--- a/org.glite.lbjp-common.log/Makefile
+++ b/org.glite.lbjp-common.log/Makefile
@@ -68,8 +68,9 @@ 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}/src/log4crc.* ${PREFIX}/share/doc/${package}-${version}
-	${INSTALL} -m 644 ${top_srcdir}/src/log4crc.example-production ${PREFIX}/etc/glite-lb-log4crc
+	${INSTALL} -m 644 ${top_srcdir}/config/log4crc ${PREFIX}/etc/glite-lb-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
 	${INSTALL} -m 755 ${LTLIB} ${PREFIX}/${libdir}/${LTLIB}
 
 clean:
diff --git a/org.glite.lbjp-common.log/README b/org.glite.lbjp-common.log/README
index f59a7bd..0c699ba 100644
--- a/org.glite.lbjp-common.log/README
+++ b/org.glite.lbjp-common.log/README
@@ -4,16 +4,15 @@ with respect to the gLite common logging recommendations v1.1:
 https://twiki.cern.ch/twiki/pub/EGEE/EGEEgLite/logging.html
 
 The implementation uses log4c (http://log4c.sourceforge.net) 
-and its configuration file log4crc. Two examples are provided
+and its configuration file log4crc. 
 
-- log4crc.example-production - this file is now being installed to 
-$GLITE_LOCATION/etc/glite-lb-log4crc and startup scripts 
-use it by setting the LOG4C_RCPATH environment variable
+There is one configuration file $GLITE_LOCATION/etc/glite-lb-log4crc
+that startup scripts use by setting the LOG4C_RCPATH environment variable.
 
-- log4crc.example-debugging - this file may be useful to copy to
-~/.log4crc (or by setting the LOG4C_RCPATH environment variable
-to this file) to obtain detailed debugging output
+A file log4crc.example-debugging may be useful to copy to $HOME/.log4crc 
+(or by setting the LOG4C_RCPATH environment variable to this file) 
+to obtain detailed debugging output.  One can debug only specific parts 
+of the LB system, for example by uncommenting LB.SERVER.DB cathegory 
+in the log4crc file, one gets only the debugging info related to the 
+underlying database subsystem calls.
 
-One can debug only specific parts of the LB system, for example
-by uncommenting LB.SERVER.DB cathegory one gets only the debugging 
-info related to the underlying database subsystem calls.
diff --git a/org.glite.lbjp-common.log/src/log4crc.example-production b/org.glite.lbjp-common.log/config/log4crc
similarity index 92%
rename from org.glite.lbjp-common.log/src/log4crc.example-production
rename to org.glite.lbjp-common.log/config/log4crc
index 476c329..bd6ced4 100644
--- a/org.glite.lbjp-common.log/src/log4crc.example-production
+++ b/org.glite.lbjp-common.log/config/log4crc
@@ -19,10 +19,10 @@
         <category name="CONTROL" priority="error" appender="syslog"/>
         <category name="CONTROL" priority="fatal" appender="stderr"/>
 
-        <!-- category name="LB" priority="debug" appender="stdout"/-->
-        <!-- category name="LB.LOGD" priority="debug" appender="stdout"/-->
-        <!-- category name="LB.INTERLOGD" priority="debug" appender="stdout"/-->
-        <!-- category name="LB.SERVER" priority="debug" appender="stdout"/-->
+        <!-- category name="LB" priority="debug" appender="stderr"/-->
+        <!-- category name="LB.LOGD" priority="debug" appender="stderr"/-->
+        <!-- category name="LB.INTERLOGD" priority="debug" appender="stderr"/-->
+        <!-- category name="LB.SERVER" priority="debug" appender="stderr"/-->
 
         <!-- default appenders ===================================== -->
         <appender name="stdout" type="stream" layout="basic"/>
diff --git a/org.glite.lbjp-common.log/src/log4crc.example-debugging b/org.glite.lbjp-common.log/config/log4crc.debugging
similarity index 100%
rename from org.glite.lbjp-common.log/src/log4crc.example-debugging
rename to org.glite.lbjp-common.log/config/log4crc.debugging