diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-05-07 14:20:07 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-05-07 14:20:07 +0200 |
| commit | 9ed218dc2ce9826e60d345482a5cdaabd25f4163 (patch) | |
| tree | 430cd7b85c1a01c809eb0f61a5ba7d5ef9b5c3a1 /runtime/queue.c | |
| parent | 7f846c53d6519476b6118282ba6b3bad625e43a3 (diff) | |
| parent | 40254dcc8cf3d9ab17f30f417a95709cbf9204bf (diff) | |
| download | rsyslog-9ed218dc2ce9826e60d345482a5cdaabd25f4163.tar.gz rsyslog-9ed218dc2ce9826e60d345482a5cdaabd25f4163.tar.bz2 rsyslog-9ed218dc2ce9826e60d345482a5cdaabd25f4163.zip | |
Merge branch 'master' into master-tcp-compress-stream
Diffstat (limited to 'runtime/queue.c')
| -rw-r--r-- | runtime/queue.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/runtime/queue.c b/runtime/queue.c index 74090a4d..600b5688 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -1150,7 +1150,6 @@ tryShutdownWorkersWithinActionTimeout(qqueue_t *pThis) DBGOPRINT((obj_t*) pThis, "trying to shutdown workers within Action Timeout"); DBGOPRINT((obj_t*) pThis, "setting EnqOnly mode\n"); pThis->bEnqOnly = 1; -dbgprintf("DDDD: setting shutdownImmediate mode, ptr %p!\n", &pThis->bShutdownImmediate); pThis->bShutdownImmediate = 1; /* now DA queue */ if(pThis->bIsDA) { @@ -1856,7 +1855,6 @@ ConsumerReg(qqueue_t *pThis, wti_t *pWti) pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &iCancelStateSave); -dbgprintf("DDDD: calling consumer with shutdownImmeditate ptr %p\n", &pThis->bShutdownImmediate); CHKiRet(pThis->pConsumer(pThis->pAction, &pWti->batch, &pThis->bShutdownImmediate)); /* we now need to check if we should deliberately delay processing a bit |