merge 313_5

diff --git a/org.glite.lb.logger/config/startup b/org.glite.lb.logger/config/startup
index ed492c2..2786cf4 100755 (executable)
--- a/org.glite.lb.logger/config/startup
+++ b/org.glite.lb.logger/config/startup
@@ -40,7 +40,7 @@ start()
        mkdir -p /var/glite/log 
        chown $GLITE_USER /var/glite/log
        echo -n Starting glite-lb-logd ...
-        (cd /tmp && ls -f /tmp |fgrep ^dglogd_sock_ |xargs rm -f)
+        (cd /tmp && ls -f /tmp |grep ^dglogd_sock_ |xargs rm -f)
        su - $GLITE_USER -c "$GLITE_LOCATION/bin/glite-lb-logd \
                $creds $port $sock $fprefix" && echo " done" || echo " FAILED"
 

diff --git a/org.glite.lb.logger/project/ChangeLog b/org.glite.lb.logger/project/ChangeLog
index bb564d6..a03dea3 100644 (file)
--- a/org.glite.lb.logger/project/ChangeLog
+++ b/org.glite.lb.logger/project/ChangeLog
@@ -8,3 +8,17 @@
 
 1.4.8-1 (lb-1.7.2-1)
 - support for notification expiration
+
+1.4.9-1 (lb-1.7.3-1)
+- treat zero event expiration time as "never"
+
+3.1.9-2 (lb-1.7.4-1)
+- rebuild wrt. downgraded security 3.1.57-1
+
+3.1.9-3 (lb-1.8.0-1)
+- startup script: use grep with ^ rather than fgrep
+
+3.1.10-1
+- fixed sending empty events
+- do not syslog "error reading server reply" unnecessarily
+

diff --git a/org.glite.lb.logger/project/version.properties b/org.glite.lb.logger/project/version.properties
index a9bb99b..34f03d3 100644 (file)
--- a/org.glite.lb.logger/project/version.properties
+++ b/org.glite.lb.logger/project/version.properties
@@ -1,3 +1,3 @@
 # $Header$
-module.version=1.4.8
+module.version=1.4.10
 module.age=1

diff --git a/org.glite.lb.logger/src/send_event.c b/org.glite.lb.logger/src/send_event.c
index 6218c21..d33d541 100644 (file)
--- a/org.glite.lb.logger/src/send_event.c
+++ b/org.glite.lb.logger/src/send_event.c
@@ -282,17 +282,10 @@ event_queue_send(struct event_queue *eq)
 #ifdef LB_PERF
     if(!nosend) {
 #endif
-        /* XXX: ljocha -- does it make sense to send empty messages ? */
        if (msg->len) {
            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);
-           /* 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;
@@ -303,9 +296,11 @@ event_queue_send(struct event_queue *eq)
            
            if((code = get_reply(eq, &rep, &code_min)) < 0) {
                    /* could not get the reply properly, so try again later */
-                   if (events_sent>0) 
+                   if (events_sent>0) {
+                       /* could be expected server connection preemption */
+                       clear_error();
                        eq->timeout = 1;
-                   else {
+                   } else {
                        eq->timeout = TIMEOUT;
                        il_log(LOG_ERR, "  error reading server %s reply:\n    %s\n", eq->dest_name, error_get_msg());
                     }