summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-03-13 14:12:56 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-03-13 14:12:56 +0000
commit8ca90eb55502cc7a6f9e6163bf7e46cb5142b2e2 (patch)
tree3ebcc8b1ded95a156185909fd2dd7a6acc3e3f87
parent5ec8aaa5e1cc8cdc010658fa2c135c9f78c93d59 (diff)
downloadrsyslog-8ca90eb55502cc7a6f9e6163bf7e46cb5142b2e2.tar.gz
rsyslog-8ca90eb55502cc7a6f9e6163bf7e46cb5142b2e2.tar.xz
rsyslog-8ca90eb55502cc7a6f9e6163bf7e46cb5142b2e2.zip
cleanup
-rw-r--r--omfwd.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/omfwd.c b/omfwd.c
index 00a3c8ed..59dd52eb 100644
--- a/omfwd.c
+++ b/omfwd.c
@@ -63,20 +63,6 @@
MODULE_TYPE_OUTPUT
-#ifdef SYSLOG_INET
-#define INET_SUSPEND_TIME 60
-/* equal to 1 minute - TODO: see if we can get rid of this now that we have
- * the retry intervals in the engine -- rgerhards, 2008-03-12
- */
-
-#define INET_RETRY_MAX 30 /* maximum of retries for gethostbyname() */
- /* was 10, changed to 30 because we reduced INET_SUSPEND_TIME by one third. So
- * this "fixes" some of implications of it (see comment on INET_SUSPEND_TIME).
- * rgerhards, 2005-07-26
- * TODO: this needs to be reviewed in spite of the new engine, too -- rgerhards, 2008-03-12
- */
-#endif
-
/* internal structures
*/
DEF_OMOD_STATIC_DATA
@@ -93,7 +79,6 @@ typedef struct _instanceData {
eDestFORW_SUSP,
eDestFORW_UNKN
} eDestState;
- int iRtryCnt;
struct addrinfo *f_addr;
int compressionLevel; /* 0 - no compression, else level for zlib */
char *port;
@@ -318,7 +303,6 @@ static rsRetVal doTryResume(instanceData *pData)
getFwdSyslogPt(pData), &hints, &res)) == 0) {
dbgprintf("%s found, resuming.\n", pData->f_hname);
pData->f_addr = res;
- pData->iRtryCnt = 0;
pData->eDestState = eDestFORW;
} else {
iRet = RS_RET_SUSPENDED;
@@ -582,7 +566,6 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1)
hints.ai_socktype = pData->protocol == FORW_UDP ? SOCK_DGRAM : SOCK_STREAM;
if( (error = getaddrinfo(pData->f_hname, getFwdSyslogPt(pData), &hints, &res)) != 0) {
pData->eDestState = eDestFORW_UNKN;
- pData->iRtryCnt = INET_RETRY_MAX;
pData->ttSuspend = time(NULL);
} else {
pData->eDestState = eDestFORW;