summaryrefslogtreecommitdiffstats
path: root/action.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-01 16:09:59 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-01 16:09:59 +0200
commit1b6d14f8aba6ee302c9fe063ddf900305eaefeb3 (patch)
tree719aee5e69ff1dd9dcd1ae3add59febda1c86499 /action.c
parentf4ec11fa779e7348f68ece1b3b50d499a0526ace (diff)
parent9020647cdcdb0ef132491838e36c870f4e4e90ea (diff)
downloadrsyslog-1b6d14f8aba6ee302c9fe063ddf900305eaefeb3.tar.gz
rsyslog-1b6d14f8aba6ee302c9fe063ddf900305eaefeb3.tar.xz
rsyslog-1b6d14f8aba6ee302c9fe063ddf900305eaefeb3.zip
Merge branch 'v5-stable' into v5-beta
Conflicts: runtime/queue.c
Diffstat (limited to 'action.c')
-rw-r--r--action.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/action.c b/action.c
index c732bcfe..a9b8c3b1 100644
--- a/action.c
+++ b/action.c
@@ -1309,7 +1309,7 @@ doSubmitToActionQ(action_t *pAction, msg_t *pMsg)
if(pAction->pQueue->qType == QUEUETYPE_DIRECT)
iRet = qqueueEnqObjDirect(pAction->pQueue, (void*) MsgAddRef(pMsg));
else
- iRet = qqueueEnqObj(pAction->pQueue, pMsg->flowCtlType, (void*) MsgAddRef(pMsg));
+ iRet = qqueueEnqObj(pAction->pQueue, eFLOWCTL_NO_DELAY, (void*) MsgAddRef(pMsg));
RETiRet;
}