From 46e2da41ea4e26cc3478085966afc1aabff767af Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Posp=C3=AD=C5=A1il?= Date: Fri, 30 Sep 2005 09:22:32 +0000 Subject: [PATCH] Bug#11050: - softened the CONNECT_ATTEMPTS to 5 attempts only --- org.glite.lb.logger/src/logd_proto.c | 9 ++++++--- org.glite.lb.logger/src/logd_proto.h | 3 +-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/org.glite.lb.logger/src/logd_proto.c b/org.glite.lb.logger/src/logd_proto.c index 8bee957..5e31fcf 100644 --- a/org.glite.lb.logger/src/logd_proto.c +++ b/org.glite.lb.logger/src/logd_proto.c @@ -261,9 +261,12 @@ int edg_wll_log_proto_server(edg_wll_GssConnection *con, char *name, char *prefi errno = i = answer = answer_sent = size = msg_size = dglllid_size = dguser_size = count = count_total = msg_sock = filedesc = filelock_status = /* priority */ unique = err = 0; buf = dglllid = dguser = jobId = name_esc = msg = msg_begin = NULL; event = NULL; - if (EDG_WLL_LOG_TIMEOUT_MAX > EDG_WLL_LOG_SYNC_TIMEOUT_MAX) timeout.tv_sec = EDG_WLL_LOG_TIMEOUT_MAX; - else timeout.tv_sec = EDG_WLL_LOG_SYNC_TIMEOUT_MAX; - timeout.tv_usec = 0; + if (EDG_WLL_LOG_TIMEOUT_MAX > EDG_WLL_LOG_SYNC_TIMEOUT_MAX) { + timeout.tv_sec = EDG_WLL_LOG_TIMEOUT_MAX; + } else { + timeout.tv_sec = EDG_WLL_LOG_SYNC_TIMEOUT_MAX; + } + timeout.tv_usec = 0; if (edg_wll_InitContext(&context) != 0) { edg_wll_ll_log(LOG_ERR,"edg_wll_InitContex(): error.\n"); answer = ENOMEM; diff --git a/org.glite.lb.logger/src/logd_proto.h b/org.glite.lb.logger/src/logd_proto.h index 365de51..dd4a890 100644 --- a/org.glite.lb.logger/src/logd_proto.h +++ b/org.glite.lb.logger/src/logd_proto.h @@ -43,8 +43,7 @@ void edg_wll_ll_log(int level, const char *fmt, ...); /* connect defaults */ -#define CONNECT_ATTEMPTS 50 -#define CONNECT_TIMEOUT 10 +#define CONNECT_ATTEMPTS 5 /* locallogger daemon listen and connect functions prototypes */ -- 1.8.2.3