summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-11-18 14:43:33 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-11-18 14:43:33 +0100
commitb6b2366faa82c8369f69fdc0be37ab780dd4b6d7 (patch)
treedaed9b60e58173ce87087bba8cb2e53ba78e4f12
parent2b665a5f631275ca3218d3fab6c8ac91b7880f81 (diff)
downloadrsyslog-b6b2366faa82c8369f69fdc0be37ab780dd4b6d7.tar.gz
rsyslog-b6b2366faa82c8369f69fdc0be37ab780dd4b6d7.tar.bz2
rsyslog-b6b2366faa82c8369f69fdc0be37ab780dd4b6d7.zip
help detect unavailable output target as quickly as possible
-rw-r--r--action.c1
-rw-r--r--tools/omfwd.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/action.c b/action.c
index 8f5ae2af..211af544 100644
--- a/action.c
+++ b/action.c
@@ -1151,6 +1151,7 @@ dbgprintf("DDDD: processMsgMain[act %d], %s\n", pAction->iActionNbr, pMsg->pszRa
if(pAction->eParamPassing == ACT_STRING_PASSING) {
pWti->actWrkrInfo[pAction->iActionNbr].pAction = pAction;
dbgprintf("DDDD: action %d is string passing - executing in commit phase\n", pAction->iActionNbr);
+ actionPrepare(pAction, pWti);
iRet = getReturnCode(pAction, pWti);
FINALIZE;
}
diff --git a/tools/omfwd.c b/tools/omfwd.c
index 8cf306ed..f0e92094 100644
--- a/tools/omfwd.c
+++ b/tools/omfwd.c
@@ -757,6 +757,7 @@ ENDtryResume
BEGINbeginTransaction
CODESTARTbeginTransaction
dbgprintf("omfwd: beginTransaction\n");
+ iRet = doTryResume(pWrkrData);
ENDbeginTransaction