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 /action.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 'action.c')
| -rw-r--r-- | action.c | 8 |
1 files changed, 0 insertions, 8 deletions
@@ -429,14 +429,6 @@ actionConstructFinalize(action_t *pThis, struct cnfparamvals *queueParams) pThis->submitToActQ = doSubmitToActionQBatch; } - /* we need to make a safety check: if the queue is NOT in direct mode, a single - * message object may be accessed by multiple threads. As such, we need to enable - * msg object thread safety in this case (this costs a bit performance and thus - * is not enabled by default. -- rgerhards, 2008-02-20 - */ - if(cs.ActionQueType != QUEUETYPE_DIRECT) - MsgEnableThreadSafety(); - /* create queue */ /* action queues always (for now) have just one worker. This may change when * we begin to implement an interface the enable output modules to request |