From 8b52bdd08fd6f6327328732d49d34087a3f0572a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Milo=C5=A1=20Mula=C4=8D?= Date: Wed, 15 Feb 2006 15:12:39 +0000 Subject: [PATCH] translate soap errors to errno ECANCELED in bk_accept_ws() --- org.glite.lb.server/src/bkserverd.c | 49 +++---------------------------------- 1 file changed, 4 insertions(+), 45 deletions(-) diff --git a/org.glite.lb.server/src/bkserverd.c b/org.glite.lb.server/src/bkserverd.c index bc524bb..137c1e9 100644 --- a/org.glite.lb.server/src/bkserverd.c +++ b/org.glite.lb.server/src/bkserverd.c @@ -1142,51 +1142,10 @@ int bk_accept_ws(int conn, struct timeval *timeout, void *cdata) } if ( err ) { - char *errt, *errd; - int ret; - - - errt = errd = NULL; - switch ( (ret = edg_wll_Error(ctx, &errt, &errd)) ) { - case ETIMEDOUT: - case EDG_WLL_ERROR_GSS: - case EPIPE: - dprintf(("[%d] %s (%s)\n", getpid(), errt, errd)); - if (!debug) syslog(LOG_ERR,"%s (%s)", errt, errd); - /* "recoverable" error - return (>0) - * fallthrough - */ - case ENOTCONN: - /* "recoverable" error - return (>0) - * return ENOTCONN to tell bones to clean up - */ - free(errt); free(errd); - return ret; - break; - - case ENOENT: - case EINVAL: - case EPERM: - case EEXIST: - case EDG_WLL_ERROR_NOINDEX: - case E2BIG: - dprintf(("[%d] %s (%s)\n", getpid(), errt, errd)); - if ( !debug ) syslog(LOG_ERR,"%s (%s)", errt, errd); - /* - * no action for non-fatal errors - */ - break; - - default: - dprintf(("[%d] %s (%s)\n", getpid(), errt, errd)); - if (!debug) syslog(LOG_CRIT,"%s (%s)",errt,errd); - /* - * unknown error - do rather return (<0) (slave will be killed) - */ - return -1; - } - free(errt); free(errd); - return 1; + // soap_print_fault(struct soap *soap, FILE *fd) maybe useful here + dprintf(("[%d] SOAP error (bk_accept_ws) \n", getpid())); + if (!debug) syslog(LOG_CRIT,"SOAP error (bk_accept_ws)"); + return ECANCELED; } return 0; -- 1.8.2.3