summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-01-14 11:58:40 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-01-14 11:58:40 +0000
commitb49bf8c9227cd0744e9cf51e79e2a921c09a2483 (patch)
tree8743397a83792d949045c4917ef3b3b2d424b3db
parent77a338e180fd51811041363f615760a14a2dc889 (diff)
downloadrsyslog-b49bf8c9227cd0744e9cf51e79e2a921c09a2483.tar.gz
rsyslog-b49bf8c9227cd0744e9cf51e79e2a921c09a2483.tar.bz2
rsyslog-b49bf8c9227cd0744e9cf51e79e2a921c09a2483.zip
removed $MainMsgQueueImmediateShutdown config directive and handling, this
has been superseeded by the Timeout params. Backward compatibility is no concern, no version with that directive was ever released.
-rw-r--r--queue.c1
-rw-r--r--queue.h2
2 files changed, 0 insertions, 3 deletions
diff --git a/queue.c b/queue.c
index 1b90151b..7851bb56 100644
--- a/queue.c
+++ b/queue.c
@@ -1091,7 +1091,6 @@ finalize_it:
}
/* some simple object access methods */
-DEFpropSetMeth(queue, bImmediateShutdown, int);
DEFpropSetMeth(queue, iPersistUpdCnt, int);
DEFpropSetMeth(queue, toQShutdown, long);
DEFpropSetMeth(queue, toActShutdown, long);
diff --git a/queue.h b/queue.h
index cc5243ad..a6d46990 100644
--- a/queue.h
+++ b/queue.h
@@ -81,7 +81,6 @@ typedef struct queue_s {
int iNumWorkerThreads;/* number of worker threads to use */
int iCurNumWrkThrd;/* current number of active worker threads */
qWrkThrd_t *pWrkThrds;/* array with control structure for the worker thread(s) associated with this queue */
- int bImmediateShutdown;/* on shutdown, drain the queue --> 0 / do NOT drain the queue --> 1 */
int iUpdsSincePersist;/* nbr of queue updates since the last persist call */
int iPersistUpdCnt; /* persits queue info after this nbr of updates - 0 -> persist only on shutdown */
int bNeedDelQIF; /* does the QIF file need to be deleted when queue becomes empty? */
@@ -137,7 +136,6 @@ rsRetVal queueSetFilePrefix(queue_t *pThis, uchar *pszPrefix, size_t iLenPrefix)
rsRetVal queueConstruct(queue_t **ppThis, queueType_t qType, int iWorkerThreads,
int iMaxQueueSize, rsRetVal (*pConsumer)(void*));
PROTOTYPEObjClassInit(queue);
-PROTOTYPEpropSetMeth(queue, bImmediateShutdown, int);
PROTOTYPEpropSetMeth(queue, iPersistUpdCnt, int);
PROTOTYPEpropSetMeth(queue, toQShutdown, long);
PROTOTYPEpropSetMeth(queue, toActShutdown, long);