merge of changes betwen merge_for_3_1_src and merge_30_31_src

diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup
index d712223..5122b2b 100755 (executable)
--- a/org.glite.lb.server/config/startup
+++ b/org.glite.lb.server/config/startup
@@ -34,13 +34,6 @@ start()
                fi
        fi
 
-       [ -z "$GLITE_LB_EXPORT_DUMPDIR" ] && GLITE_LB_EXPORT_DUMPDIR=/tmp/dump
-       purgedir="--dump-prefix $GLITE_LB_EXPORT_DUMPDIR"
-       [ -d "$GLITE_LB_EXPORT_DUMPDIR" ] || mkdir "$GLITE_LB_EXPORT_DUMPDIR" && chown $GLITE_USER:$GLITE_GROUP "$GLITE_LB_EXPORT_DUMPDIR"
-
-       [ -z "$GLITE_LB_EXPORT_JPREG_MAILDIR" ] && GLITE_LB_EXPORT_JPREG_MAILDIR=/tmp/jpreg
-       maildir="--jpreg-dir $GLITE_LB_EXPORT_JPREG_MAILDIR"
-       [ -d "$GLITE_LB_EXPORT_JPREG_MAILDIR" ] || mkdir "$GLITE_LB_EXPORT_JPREG_MAILDIR" && chown $GLITE_USER:$GLITE_GROUP "$GLITE_LB_EXPORT_JPREG_MAILDIR"
 
        [ -z "$creds" ] && echo $0: WARNING: No credentials specified. Using default lookup which is dangerous. >&2
 
@@ -50,8 +43,7 @@ start()
        su - $GLITE_USER -c "$GLITE_LOCATION/bin/glite-lb-bkserverd \
                --notif-il-sock=/tmp/glite-lb-notif.sock \
                --notif-il-fprefix=/var/tmp/glite-lb-notif \
-               $creds -i $pidfile $port $purgedir $maildir" \
-       && echo " done" || echo " FAILED"
+               $creds -i $pidfile $port" && echo " done" || echo " FAILED"
 
        echo -n Starting glite-lb-notif-interlogd ...
        su - $GLITE_USER -c "$GLITE_LOCATION/bin/glite-lb-notif-interlogd \

diff --git a/org.glite.lb.server/src/il_notification.c b/org.glite.lb.server/src/il_notification.c
index c35c221..d183203 100644 (file)
--- a/org.glite.lb.server/src/il_notification.c
+++ b/org.glite.lb.server/src/il_notification.c
@@ -57,7 +57,7 @@ notif_create_ulm(
        event->any.level = context->p_level;
        event->any.source = context->p_source;
        if (context->p_instance) event->notification.src_instance = strdup(context->p_instance);
-       event->notification.notifId = reg_id;
+       event->notification.notifId = edg_wll_NotifIdDup(reg_id);
        if (owner) event->notification.owner = strdup(owner);
        if (host) event->notification.dest_host = strdup(host);
        event->notification.dest_port = port;

diff --git a/org.glite.lb.server/src/lbs_db.c b/org.glite.lb.server/src/lbs_db.c
index e0ce329..76fa57c 100644 (file)
--- a/org.glite.lb.server/src/lbs_db.c
+++ b/org.glite.lb.server/src/lbs_db.c
@@ -78,6 +78,8 @@ int edg_wll_ExecStmt(edg_wll_Context ctx,char *txt,edg_wll_Stmt *stmt)
        int     err;
        int     retry_nr = 0;
        int     do_reconnect = 0;
+       struct timeval  start,end;
+       int     pid;
 
        edg_wll_ResetError(ctx);
 
@@ -89,6 +91,10 @@ fputs(txt,stderr);
 putc(10,stderr);
 */
 
+#ifdef LBS_DB_PROFILE
+       gettimeofday(&start,NULL);
+#endif
+
        while (retry_nr == 0 || do_reconnect) {
                do_reconnect = 0;
                if (mysql_query((MYSQL *) ctx->mysql,txt)) {
@@ -132,6 +138,15 @@ putc(10,stderr);
                MYSQL_RES       *r = mysql_store_result((MYSQL *) ctx->mysql);
                mysql_free_result(r);
        }
+#ifdef LBS_DB_PROFILE
+       gettimeofday(&end,NULL);
+       end.tv_usec -= start.tv_usec;
+       end.tv_sec -= start.tv_sec;
+       if (end.tv_usec < 0) { end.tv_sec--; end.tv_usec += 1000000; }
+
+       pid = getpid();
+       fprintf(stderr,"[%d] %s\n[%d] %3ld.%06ld\n",pid,txt,pid,end.tv_sec,end.tv_usec);
+#endif
        
        return mysql_affected_rows((MYSQL *) ctx->mysql);
 }