Merge from merge_313_2_src.

diff --git a/org.glite.lb.proxy/Makefile b/org.glite.lb.proxy/Makefile
index c24660a..3f2e047 100644 (file)
--- a/org.glite.lb.proxy/Makefile
+++ b/org.glite.lb.proxy/Makefile
@@ -94,6 +94,8 @@ LB_PROXY_LIBS:= \
 
 
 glite-lb-proxy: lbproxy.o fake_write2rgma.o ${STATIC_LIB_BK}
+       @echo DEBUG: mysql_version=${mysql_version} mysql_prefix=${mysql_prefix}
+       @echo DEBUG: shell: x$(shell echo ${mysql_version} | cut -d. -f1,2)x
        ${LINK} -o $@ lbproxy.o fake_write2rgma.o ${LB_PROXY_LIBS}
 
 glite-lb-proxy-perf: lbproxy.o fake_write2rgma.o ${STATIC_LIB_BK}

diff --git a/org.glite.lb.proxy/src/lbproxy.c b/org.glite.lb.proxy/src/lbproxy.c
index 5b8616a..ba563b5 100644 (file)
--- a/org.glite.lb.proxy/src/lbproxy.c
+++ b/org.glite.lb.proxy/src/lbproxy.c
@@ -529,6 +529,8 @@ int accept_serve(int conn, struct timeval *timeout, void *cdata)
                switch ( (err = edg_wll_Error(ctx, &errt, &errd)) ) {
                case ETIMEDOUT:
                case EPIPE:
+               case EIO:
+               case EDG_WLL_IL_PROTO:
                        dprintf(("[%d] %s (%s)\n", getpid(), errt, errd));
                        if (!debug) syslog(LOG_ERR,"%s (%s)", errt, errd);
                        /*      fallthrough
@@ -539,18 +541,30 @@ int accept_serve(int conn, struct timeval *timeout, void *cdata)
                        break;
 
                case ENOENT:
-               case EINVAL:
                case EPERM:
                case EEXIST:
                case EDG_WLL_ERROR_NOINDEX:
                case E2BIG:
                        dprintf(("[%d] %s (%s)\n", getpid(), errt, errd));
+                       break;
+               case EINVAL:
+               case EDG_WLL_ERROR_PARSE_BROKEN_ULM:
+               case EDG_WLL_ERROR_PARSE_EVENT_UNDEF:
+               case EDG_WLL_ERROR_PARSE_MSG_INCOMPLETE:
+               case EDG_WLL_ERROR_PARSE_KEY_DUPLICITY:
+               case EDG_WLL_ERROR_PARSE_KEY_MISUSE:
+               case EDG_WLL_ERROR_PARSE_OK_WITH_EXTRA_FIELDS:
+               case EDG_WLL_ERROR_JOBID_FORMAT:
+               case EDG_WLL_ERROR_MD5_CLASH:
+                       dprintf(("[%d] %s (%s)\n", getpid(), errt, errd));
                        if ( !debug ) syslog(LOG_ERR,"%s (%s)", errt, errd);
                        /*
                         *      no action for non-fatal errors
                         */
                        break;
                        
+               case EDG_WLL_ERROR_DB_CALL:
+               case EDG_WLL_ERROR_SERVER_RESPONSE:
                default:
                        dprintf(("[%d] %s (%s)\n", getpid(), errt, errd));
                        if (!debug) syslog(LOG_CRIT,"%s (%s)",errt,errd);