let empty notification message get through the output queue to keep event_store commi...

diff --git a/org.glite.lb.logger/src/event_store.c b/org.glite.lb.logger/src/event_store.c
index 37dd4f9..d919945 100644 (file)
--- a/org.glite.lb.logger/src/event_store.c
+++ b/org.glite.lb.logger/src/event_store.c
@@ -347,7 +347,7 @@ event_store_quarantine(struct event_store *es)
 int
 event_store_recover(struct event_store *es)
 {
-  struct event_queue *eq_l = NULL, *eq_b;
+  struct event_queue *eq_l = NULL, *eq_b = NULL;
   struct server_msg *msg;
   char *event_s;
   int fd, ret;
@@ -364,9 +364,9 @@ event_store_recover(struct event_store *es)
 #else
   /* find bookkepping server queue */
   eq_b = queue_list_get(es->job_id_s);
-#endif
   if(eq_b == NULL) 
     return(-1);
+#endif
 
 #if !defined(IL_NOTIFICATIONS)
   /* get log server queue */

diff --git a/org.glite.lb.logger/src/il_master.c b/org.glite.lb.logger/src/il_master.c
index ea4f97e..793959c 100644 (file)
--- a/org.glite.lb.logger/src/il_master.c
+++ b/org.glite.lb.logger/src/il_master.c
@@ -44,8 +44,11 @@ enqueue_msg(struct event_queue *eq, struct server_msg *msg)
 #if defined(IL_NOTIFICATIONS)
        /* if there are no data to send, do not send anything 
           (messsage was just to change the delivery address) */
-       if(msg->len == 0) 
+       /* CORRECTION - let the message pass through the output queue
+          to commit it properly and keep event_store in sync */
+       /* if(msg->len == 0) 
                return(0);
+       */
 #endif
        /* avoid losing signal to thread */
        event_queue_cond_lock(eq);