diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-06 17:03:51 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-06 17:03:51 +0100 |
| commit | 27e0f06b17b59e5de7db94ec1d0e74369536373a (patch) | |
| tree | c9dcaf1dddc64755ef1db3203230adc9819a3895 /tools/syslogd.c | |
| parent | bfae69d68b0032a383821a54bc52aeff36a90e52 (diff) | |
| parent | 3495720a2f6bc69ccba4c0d978ee815812cc9b75 (diff) | |
| download | rsyslog-27e0f06b17b59e5de7db94ec1d0e74369536373a.tar.gz rsyslog-27e0f06b17b59e5de7db94ec1d0e74369536373a.tar.bz2 rsyslog-27e0f06b17b59e5de7db94ec1d0e74369536373a.zip | |
Merge branch 'v6-stable-newmsglock' into v7-stable-newmsglock
Conflicts:
tools/syslogd.c
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index ae821f60..62c18e72 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -638,7 +638,6 @@ submitMsg(msg_t *pMsg) FINALIZE; } - MsgPrepareEnqueue(pMsg); qqueueEnqObj(pQueue, pMsg->flowCtlType, (void*) pMsg); finalize_it: @@ -672,10 +671,6 @@ multiSubmitMsg(multi_submit_t *pMultiSub) FINALIZE; } - for(i = 0 ; i < pMultiSub->nElem ; ++i) { - MsgPrepareEnqueue(pMultiSub->ppMsgs[i]); - } - iRet = pQueue->MultiEnq(pQueue, pMultiSub); pMultiSub->nElem = 0; @@ -1124,11 +1119,6 @@ rsRetVal createMainQueue(qqueue_t **ppQueue, uchar *pszQueueName, struct cnfpara uchar qfrenamebuf[1024]; DEFiRet; - /* switch the message object to threaded operation, if necessary */ - if(queueParams != NULL || ourConf->globals.mainQ.MainMsgQueType == QUEUETYPE_DIRECT || ourConf->globals.mainQ.iMainMsgQueueNumWorkers > 1) { - MsgEnableThreadSafety(); - } - /* create message queue */ CHKiRet_Hdlr(qqueueConstruct(ppQueue, ourConf->globals.mainQ.MainMsgQueType, ourConf->globals.mainQ.iMainMsgQueueNumWorkers, ourConf->globals.mainQ.iMainMsgQueueSize, msgConsumer)) { /* no queue is fatal, we need to give up in that case... */ |