diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2007-07-24 14:53:23 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2007-07-24 14:53:23 +0000 |
| commit | 6d231d5f159703bb13a2505e6de6c820a3ca05bc (patch) | |
| tree | f3f1782ea0e1c85d7209b81234c40211b0053fc6 /omfwd.c | |
| parent | 5cbb54ed6ad1934875b080286b9933400c817e85 (diff) | |
| download | rsyslog-6d231d5f159703bb13a2505e6de6c820a3ca05bc.tar.gz rsyslog-6d231d5f159703bb13a2505e6de6c820a3ca05bc.tar.xz rsyslog-6d231d5f159703bb13a2505e6de6c820a3ca05bc.zip | |
removed F_UNUSED and cleaned up action-disabling handling
Diffstat (limited to 'omfwd.c')
| -rw-r--r-- | omfwd.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -81,6 +81,7 @@ static rsRetVal doActionFwd(selector_t *f) { char *psz; /* temporary buffering */ register unsigned l; + rsRetVal iRet = RS_RET_OK; int i; unsigned e, lsent = 0; int bSendSuccess; @@ -132,7 +133,7 @@ static rsRetVal doActionFwd(selector_t *f) dprintf("Retries: %d\n", f->f_prevcount); if ( --f->f_prevcount < 0 ) { dprintf("Giving up.\n"); - f->f_type = F_UNUSED; + iRet = RS_RET_DISABLE_ACTION; } else dprintf("Left retries: %d\n", f->f_prevcount); @@ -248,7 +249,7 @@ static rsRetVal doActionFwd(selector_t *f) } break; } - return RS_RET_OK; + return iRet; } |