log4c logging in harvester.

diff --git a/org.glite.lb.harvester/Makefile b/org.glite.lb.harvester/Makefile
index 15f0b92..ccfa702 100644 (file)
--- a/org.glite.lb.harvester/Makefile
+++ b/org.glite.lb.harvester/Makefile
@@ -37,7 +37,7 @@ ifeq ($(GLITE_LB_HARVESTER_WITH_OLD_LB),yes)
 CPPFLAGS:=${GLOBUS_CPPFLAGS} $(CPPFLAGS) -DWITH_OLD_LB=1
 LIBS:=$(LIBS) -lglite_wmsutils_cjobid
 else
-LIBS:=$(LIBS) -lglite_jobid -lglite_lbu_trio
+LIBS:=$(LIBS) -lglite_jobid -lglite_lbu_trio -lglite_lbu_log
 endif
 
 COMPILE:=libtool --mode=compile ${CC} ${CPPFLAGS} ${CFLAGS}

diff --git a/org.glite.lb.harvester/src/harvester.c b/org.glite.lb.harvester/src/harvester.c
index 41f504a..6fbde2c 100644 (file)
--- a/org.glite.lb.harvester/src/harvester.c
+++ b/org.glite.lb.harvester/src/harvester.c
@@ -35,7 +35,9 @@ limitations under the License.
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#ifdef WITH_OLD_LB
 #include <syslog.h>
+#endif
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -44,10 +46,10 @@ limitations under the License.
 #ifdef WITH_LBU_DB
 #include <glite/lbu/trio.h>
 #include <glite/lbu/db.h>
-#include <glite/lbu/log.h>
 #endif
 #include <glite/lb/context.h>
 #ifndef WITH_OLD_LB
+#include <glite/lbu/log.h>
 #include <glite/lb/connpool.h>
 #endif
 #include <glite/lb/notification.h>
@@ -223,6 +225,7 @@ typedef struct {
 
 static const char rcsid[] = "@(#)$Id$";
 
+#ifdef WITH_OLD_LB
 static int rtm2syslog[] = {
        LOG_ERR,
        LOG_WARNING,
@@ -230,6 +233,15 @@ static int rtm2syslog[] = {
        LOG_DEBUG,
        LOG_DEBUG,
 };
+#else
+static int rtm2log4c[] = {
+       LOG_PRIORITY_ERROR, // errors
+       LOG_PRIORITY_WARN,  // warnings
+       LOG_PRIORITY_INFO,  // progress
+       LOG_PRIORITY_DEBUG, // debugging
+       LOG_PRIORITY_NOTSET // insane logging
+};
+#endif
 
 static const struct option opts[] = {
        { "wlcg-binary", required_argument,     NULL,   0},
@@ -320,9 +332,13 @@ void lvprintf_func(thread_t *t, const char *description, int level, const char *
 
        if (level <= WRN && !config.daemonize) fprintf(stderr, RTM_TTY_RED);
        if (config.daemonize) {
+#ifdef WITH_OLD_LB
                openlog(NULL, LOG_PID | LOG_CONS, LOG_DAEMON);
                syslog(rtm2syslog[level], "%s", line);
                closelog();
+#else
+               glite_common_log(LOG_CATEGORY_LB_HARVESTER, rtm2log4c[level], line);
+#endif
        } else {
                fputs(line, stderr);
        }
@@ -2464,6 +2480,12 @@ int main(int argn, char *argv[]) {
                }
        }
        if (config.daemonize) {
+#ifndef WITH_OLD_LB
+               if (glite_common_log_init()) {
+                       fprintf(stderr,"glite_common_log_init() failed, exiting.");
+                       exit(RTM_EXIT_ERROR);
+               }
+#endif
                if (daemon(0, 0) == -1) {
                        lprintf(NULL, ERR, "can't daemonize: %s", strerror(errno));
                        goto quit_guard0;
@@ -2686,6 +2708,9 @@ quit:
        if (config.pidfile && !config.guard) {
                if (remove(config.pidfile) == -1) lprintf(NULL, WRN, "can't remove pidfile '%s': %s", config.pidfile, strerror(errno));
        }
+#ifdef WITH_OLD_LB
+       if (config.daemonize) glite_common_log_fini();
+#endif
 
 #ifdef WITH_LBU_DB
        db_free(NULL, db.dbctx);

diff --git a/org.glite.lbjp-common.log/config/log4crc b/org.glite.lbjp-common.log/config/log4crc
index bd6ced4..38ffe36 100644 (file)
--- a/org.glite.lbjp-common.log/config/log4crc
+++ b/org.glite.lbjp-common.log/config/log4crc
@@ -23,6 +23,7 @@
         <!-- category name="LB.LOGD" priority="debug" appender="stderr"/-->
         <!-- category name="LB.INTERLOGD" priority="debug" appender="stderr"/-->
         <!-- category name="LB.SERVER" priority="debug" appender="stderr"/-->
+        <!-- category name="LB.HARVESTER" priority="*" appender="syslog"/-->
 
         <!-- default appenders ===================================== -->
         <appender name="stdout" type="stream" layout="basic"/>

diff --git a/org.glite.lbjp-common.log/src/log.h b/org.glite.lbjp-common.log/src/log.h
index 6aa4dcd..d6eff3f 100644 (file)
--- a/org.glite.lbjp-common.log/src/log.h
+++ b/org.glite.lbjp-common.log/src/log.h
@@ -37,6 +37,7 @@ extern "C" {
 #define LOG_CATEGORY_LB_SERVER                 "LB.SERVER"
 #define LOG_CATEGORY_LB_SERVER_DB      "LB.SERVER.DB"
 #define LOG_CATEGORY_LB_SERVER_REQUEST "LB.SERVER.REQUEST"
+#define LOG_CATEGORY_LB_HARVESTER       "LB.HARVESTER"
 #define LOG_CATEGORY_LB_HARVESTER_DB    "LB.HARVESTER.DB"
 
 /* default priorities