- changed the ommysql output plugin so that the (lengthy) connection

    initialization now takes place in message processing. This works much
    better with the new queued action mode (fast startup)
- fixed a newly introduced bug that caused output module's doAction entry
    point to be called on more than one thread under some circumstances

1 files changed, 0 insertions, 6 deletions

diff --git a/syslogd.c b/syslogd.c
index ed59f0d5..d47197d4 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -3758,12 +3758,6 @@ rsRetVal addAction(action_t **ppAction, modInfo_t *pMod, void *pModData, omodStr
 	if(pAction->iNumTpls > 0) {
 		/* we first need to create the template pointer array */
 		if((pAction->ppTpl = calloc(pAction->iNumTpls, sizeof(struct template *))) == NULL) {
-			glblHadMemShortage = 1;
-			ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY);
-		}
-		/* and now the array for doAction() message pointers */
-		if((pAction->ppMsgs = calloc(pAction->iNumTpls, sizeof(uchar *))) == NULL) {
-			glblHadMemShortage = 1;
 			ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY);
 		}
 	}