file-rotating interlogger for glite 3.1

diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 01161ab..733ff60 100644 (file)
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -41,6 +41,8 @@ else
        WS_INTERLOGD:=glite-lb-ws-interlogd
 endif
 
+GLOBUSTHRINC=-I${globus_prefix}/include/${thrflavour}
+
 DEBUG:=-g -O0
 CFLAGS:=${DEBUG} \
        -I${stagedir}/include -I${top_srcdir}/src \
@@ -112,7 +114,7 @@ MAN = $(MAN_GZ:.gz=)
 
 default: all 
 
-all compile: $(LOGD) $(INTERLOGD) $(NOTIF_INTERLOGD) ${MAN_GZ}
+all compile: $(NOTIF_INTERLOGD)
 
 glite-lb-logd: ${LOGD_OBJS}
        ${LINK} -o $@ ${LOGD_OBJS} ${COMMON_LIB}_${nothrflavour} ${TRIO_LIB}
@@ -174,20 +176,12 @@ install:
        -mkdir -p ${PREFIX}/etc/init.d
        -mkdir -p ${PREFIX}/share/doc/${package}-${version}
        -mkdir -p ${PREFIX}/share/man/man8
-       ${INSTALL} -m 755 ${LOGD} ${PREFIX}/bin
-       ${INSTALL} -m 755 ${INTERLOGD} ${PREFIX}/bin
+#      ${INSTALL} -m 755 ${LOGD} ${PREFIX}/bin
+#      ${INSTALL} -m 755 ${INTERLOGD} ${PREFIX}/bin
        ${INSTALL} -m 755 ${NOTIF_INTERLOGD} ${PREFIX}/bin
-ifdef LB_PERF
-       -mkdir -p ${PREFIX}/sbin
-       ${INSTALL} -m 755 ${top_srcdir}/src/perftest_ll.sh ${PREFIX}/sbin
-endif
-       ${INSTALL} -m 755 ${top_srcdir}/config/startup ${PREFIX}/etc/init.d/glite-lb-locallogger
-       ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
-       ( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${PREFIX}/share/doc/${package}-${version} )
-       ${INSTALL} -m 644 ${MAN_GZ} ${PREFIX}/share/man/man8
 
 ${INTERLOG_NOBJS}: %.no: %.c
-       ${CC} ${CFLAGS} -DIL_NOTIFICATIONS -c $< -o $@
+       ${CC} ${CFLAGS} ${GLOBUSTHRINC} -DIL_NOTIFICATIONS -c $< -o $@
 
 ${INTERLOG_OBJS}: %.o: %.c
        ${CC} ${CFLAGS} -c $< -o $@

diff --git a/org.glite.lb.logger/src/event_queue.c b/org.glite.lb.logger/src/event_queue.c
index 5e59e68..455414f 100644 (file)
--- a/org.glite.lb.logger/src/event_queue.c
+++ b/org.glite.lb.logger/src/event_queue.c
@@ -12,7 +12,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "glite/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 
 #include "interlogd.h"
 

diff --git a/org.glite.lb.logger/src/il_master.c b/org.glite.lb.logger/src/il_master.c
index 384c89a..47808e8 100644 (file)
--- a/org.glite.lb.logger/src/il_master.c
+++ b/org.glite.lb.logger/src/il_master.c
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "glite/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 #include "glite/lb/context.h"
 #include "glite/lb/events_parse.h"
 #include "glite/lb/il_string.h"

diff --git a/org.glite.lb.logger/src/interlogd.c b/org.glite.lb.logger/src/interlogd.c
index e6ebded..4b8b405 100644 (file)
--- a/org.glite.lb.logger/src/interlogd.c
+++ b/org.glite.lb.logger/src/interlogd.c
@@ -350,7 +350,7 @@ main (int argc, char **argv)
   }
   cred_handle->creds = NULL;
   cred_handle->counter = 0;
-  ret = edg_wll_gss_acquire_cred_gsi(cert_file, key_file, &cred_handle->creds, &gss_stat);
+  ret = edg_wll_gss_acquire_cred_gsi(cert_file, key_file, &cred_handle->creds, NULL, &gss_stat);
   if (ret) {
      char *gss_err = NULL;
      char *str;

diff --git a/org.glite.lb.logger/src/interlogd.h b/org.glite.lb.logger/src/interlogd.h
index e5ff035..c5faf7e 100644 (file)
--- a/org.glite.lb.logger/src/interlogd.h
+++ b/org.glite.lb.logger/src/interlogd.h
@@ -64,7 +64,7 @@ extern int TIMEOUT;
 #define EXIT_TIMEOUT (1*60)
 
 typedef struct cred_handle {
-       edg_wll_GssCred creds;
+       gss_cred_id_t creds;
        int counter;
 } cred_handle_t;
 extern cred_handle_t *cred_handle;

diff --git a/org.glite.lb.logger/src/queue_mgr.c b/org.glite.lb.logger/src/queue_mgr.c
index 2879e14..f2c9b3b 100644 (file)
--- a/org.glite.lb.logger/src/queue_mgr.c
+++ b/org.glite.lb.logger/src/queue_mgr.c
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <assert.h>
 
-#include "glite/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 #include "glite/lb/context.h"
 
 #include "interlogd.h"

diff --git a/org.glite.lb.logger/src/recover.c b/org.glite.lb.logger/src/recover.c
index 18fc3b4..e69398d 100644 (file)
--- a/org.glite.lb.logger/src/recover.c
+++ b/org.glite.lb.logger/src/recover.c
@@ -34,17 +34,18 @@ recover_thread(void *q)
                }
                il_log(LOG_INFO, "Reloading certificate...\n");
                if (edg_wll_gss_watch_creds(cert_file, &cert_mtime) > 0) {
-                       edg_wll_GssCred new_creds = NULL;
+                       gss_cred_id_t new_creds = GSS_C_NO_CREDENTIAL;
                        int ret;
 
                        ret = edg_wll_gss_acquire_cred_gsi(cert_file,key_file, 
-                               &new_creds, NULL);
-                       if (new_creds != NULL) {
+                               &new_creds, NULL, NULL);
+                       if (new_creds != GSS_C_NO_CREDENTIAL) {
                                if(pthread_mutex_lock(&cred_handle_lock) < 0)
                                        abort();
                                /* if no one is using the old credentials, release them */
                                if(cred_handle && cred_handle->counter == 0) {
-                                       edg_wll_gss_release_cred(&cred_handle->creds, NULL);
+                                       OM_uint32       min_stat;
+                                       gss_release_cred(&min_stat,&cred_handle->creds);
                                        free(cred_handle);
                                        il_log(LOG_DEBUG, "  freed old credentials\n");
                                }

diff --git a/org.glite.lb.logger/src/send_event.c b/org.glite.lb.logger/src/send_event.c
index d0e546b..20c8dda 100644 (file)
--- a/org.glite.lb.logger/src/send_event.c
+++ b/org.glite.lb.logger/src/send_event.c
@@ -16,7 +16,7 @@
  *   - L/B server protocol handling routines 
  */
 
-#include "glite/jobid/cjobid.h"
+#include "glite/wmsutils/jobid/cjobid.h"
 #include "glite/lb/il_string.h"
 #include "glite/lb/context.h"
 
@@ -195,7 +195,8 @@ event_queue_connect(struct event_queue *eq)
     /* check if we need to release the credentials */
     --local_cred_handle->counter;
     if(local_cred_handle != cred_handle && local_cred_handle->counter == 0) {
-           edg_wll_gss_release_cred(&local_cred_handle->creds, NULL);
+           OM_uint32   min_stat;
+           gss_release_cred(&min_stat,&local_cred_handle->creds);
            free(local_cred_handle);
            il_log(LOG_DEBUG, "   freed credentials, not used anymore\n");
     }