From: Jiří Škrábal <nykolas@ics.muni.cz>
Date: Fri, 5 Aug 2005 14:45:28 +0000 (+0000)
Subject: - count with the case when the edg_wll_StoreProtoProxy() return non-error
X-Git-Tag: glite-lb-proxy_R_1_1_1~3
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=8feea9f43383ce8a35775bd79a0a509d62a38c7c;p=jra1mw.git

- count with the case when the edg_wll_StoreProtoProxy() return non-error
  value, but the error in the context is set
---

diff --git a/org.glite.lb.proxy/src/lbproxy.c b/org.glite.lb.proxy/src/lbproxy.c
index 9def0c3..398b732 100644
--- a/org.glite.lb.proxy/src/lbproxy.c
+++ b/org.glite.lb.proxy/src/lbproxy.c
@@ -409,14 +409,13 @@ int accept_store(int conn, struct timeval *timeout, void *cdata)
 {
 	edg_wll_Context		ctx = ((struct clnt_data_t *) cdata)->ctx;
 	struct timeval		before, after;
+	char			   *errt, *errd;
+	int					err;
 
 	memcpy(&ctx->p_tmp_timeout, timeout, sizeof(ctx->p_tmp_timeout));
 	gettimeofday(&before, NULL);
-	if ( edg_wll_StoreProtoProxy(ctx) ) { 
-		char    *errt, *errd;
-		int		err;
-
-		errt = errd = NULL;
+	errt = errd = NULL;
+	if ( edg_wll_StoreProtoProxy(ctx) ) {
 		switch ( (err = edg_wll_Error(ctx, &errt, &errd)) ) {
 		case ETIMEDOUT:
 		case EPIPE:
@@ -445,6 +444,11 @@ int accept_store(int conn, struct timeval *timeout, void *cdata)
 			return -1;
 		} 
 		free(errt); free(errd);
+	} else if ( edg_wll_Error(ctx, &errt, &errd) ) { 
+		dprintf(("[%d] %s (%s)\n", getpid(), errt, errd));
+		if ( !debug ) syslog(LOG_ERR, "%s (%s)", errt, errd);
+		free(errt); free(errd);
+		edg_wll_ResetError(ctx);
 	}
 	gettimeofday(&after, NULL);
 	if ( decrement_timeout(timeout, before, after) ) {