rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-17 14:00:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v6-devel'

Browse Source
This commit is contained in:
Rainer Gerhards 2012-09-19 18:57:37 +02:00
commit 1b1b2a1651
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -95,6 +95,8 @@ Version 6.5.0 [devel] 2012-08-28
http://bugzilla.adiscon.com/show_bug.cgi?id=353
---------------------------------------------------------------------------
Version 6.4.2 [V6-STABLE] 2012-09-??
- bugfix: potential abort, if action queue could not be properly started
This most importantly could happen due to configuration errors.
- bugfix: remove invalid socket option call from imuxsock
Thanks to Cristian Ionescu-Idbohrn and Jonny Törnbom
- bugfix: missing support for escape sequences in RainerScript

17
action.c
View File

@ -1379,12 +1379,18 @@ doSubmitToActionQ(action_t *pAction, msg_t *pMsg)
{
DEFiRet;
if(pAction->eState == ACT_STATE_DIED) {
DBGPRINTF("action %p died, do NOT execute\n", pAction);
FINALIZE;
}
STATSCOUNTER_INC(pAction->ctrProcessed, pAction->mutCtrProcessed);
if(pAction->pQueue->qType == QUEUETYPE_DIRECT)
iRet = qqueueEnqObjDirect(pAction->pQueue, (void*) MsgAddRef(pMsg));
else
iRet = qqueueEnqObj(pAction->pQueue, eFLOWCTL_NO_DELAY, (void*) MsgAddRef(pMsg));
finalize_it:
RETiRet;
}
@ -1589,9 +1595,18 @@ finalize_it:
*/
DEFFUNC_llExecFunc(doActivateActions)
{
rsRetVal localRet;
action_t *pThis = (action_t*) pData;
BEGINfunc
qqueueStart(pThis->pQueue);
localRet = qqueueStart(pThis->pQueue);
if(localRet != RS_RET_OK) {
errmsg.LogError(0, localRet, "error starting up action queue");
if(localRet == RS_RET_FILE_PREFIX_MISSING) {
errmsg.LogError(0, localRet, "file prefix (work directory?) "
"is missing");
}
actionDisable(pThis);
}
DBGPRINTF("Action %p: queue %p started\n", pThis, pThis->pQueue);
ENDfunc
return RS_RET_OK; /* we ignore errors, we can not do anything either way */

2
action.h
View File

@ -36,7 +36,7 @@ extern int glbliActionResumeRetryCount;
typedef enum {
ACT_STATE_DIED = 0, /* action permanently failed and now disabled - MUST BE ZEO! */
ACT_STATE_DIED = 0, /* action permanently failed and now disabled - MUST BE ZERO! */
ACT_STATE_RDY = 1, /* action ready, waiting for new transaction */
ACT_STATE_ITX = 2, /* transaction active, waiting for new data or commit */
ACT_STATE_COMM = 3, /* transaction finished (a transient state) */