minor fix

diff --git a/org.glite.lb.logger/src/event_queue.c b/org.glite.lb.logger/src/event_queue.c
index 65a22a8..b9345d3 100644 (file)
--- a/org.glite.lb.logger/src/event_queue.c
+++ b/org.glite.lb.logger/src/event_queue.c
@@ -44,7 +44,7 @@ event_queue_create(char *server_name)
   if(p)
     *(p-1) = ':';
   
-#if defined(IL_NOTIFICATIONS)
+#if defined(IL_NOTIFICATIONS) || defined(IL_WS)
   eq->dest_port = atoi(p);
 #else
   eq->dest_port = p ? atoi(p)+1 : GLITE_JOBID_DEFAULT_PORT+1;
@@ -304,6 +304,8 @@ event_queue_move_events(struct event_queue *eq_s,
                                dest_tail = &(p->prev);
                                eq_d->tail = p;
                        } else {
+                               /* signal that the message was 'delivered' */
+                               event_store_commit(p->msg->es, p->msg->ev_len, queue_list_is_log(eq_s));
                                /* free the message */
                                server_msg_free(p->msg);
                                free(p);

diff --git a/org.glite.lb.logger/src/send_event.c b/org.glite.lb.logger/src/send_event.c
index 4df7c8a..6218c21 100644 (file)
--- a/org.glite.lb.logger/src/send_event.c
+++ b/org.glite.lb.logger/src/send_event.c
@@ -287,10 +287,12 @@ event_queue_send(struct event_queue *eq)
            tv.tv_sec = TIMEOUT;
            tv.tv_usec = 0;
            ret = edg_wll_gss_write_full(&eq->gss, msg->msg, msg->len, &tv, &bytes_sent, &gss_stat);
-           if(ret < 0) {
+           /* commented out due to the conflict with following ljocha's code
+             if(ret < 0) {
                    eq->timeout = TIMEOUT;
                    return(0);
            }
+           */
            if(ret < 0) {
              if (ret == EDG_WLL_GSS_ERROR_ERRNO && errno == EPIPE && events_sent > 0)
                eq->timeout = 0;