376 Commits

Author SHA1 Message Date
Bojan Smojver
e4bc1b5448 bugfix: typo in queue configuration parameter name 2014-10-24 12:18:13 +02:00
Rainer Gerhards
4b1964712c Merge branch 'v7-stable' into v8-stable
Conflicts:
	runtime/ruleset.c
2014-07-22 22:52:29 +02:00
Rainer Gerhards
0152b9f221 fix regression from commit a955a9900629e2065e3ed1dd9d8f5a94e6faa7f0 2014-07-22 22:11:34 +02:00
Rainer Gerhards
979d36a08b Merge branch 'v7-stable' into v8-stable 2014-07-22 17:48:30 +02:00
Tomas Heinrich
a955a99006 bugfix: check return value of malloc()
Error: NULL_RETURNS (CWE-476):
rsyslog-7.4.10/runtime/queue.c:2126: returned_null: Function "malloc(size_t)" returns null (checked 140 out of 168 times).
rsyslog-7.4.10/action.c:1197: example_checked: Example 1: "malloc(batchNumMsgs(pBatch) * 1UL)" has its value checked in "(active = malloc(batchNumMsgs(pBatch) * 1UL)) == NULL".
rsyslog-7.4.10/grammar/lexer.l:302: example_checked: Example 2: "malloc(40UL)" has its value checked in "(bs = malloc(40UL)) == NULL".
rsyslog-7.4.10/grammar/rainerscript.c:2483: example_checked: Example 3: "malloc(8UL)" has its value checked in "(ar->arr = malloc(8UL)) == NULL".
rsyslog-7.4.10/plugins/imklog/bsd.c:221: example_checked: Example 4: "malloc(1UL * (iMaxLine + 1))" has its value checked in "(pRcv = (uchar *)malloc(1UL * (iMaxLine + 1))) == NULL".
rsyslog-7.4.10/plugins/imuxsock/imuxsock.c:968: example_checked: Example 5: "malloc(1UL * (iMaxLine + 1))" has its value checked in "(pRcv = (uchar *)malloc(1UL * (iMaxLine + 1))) == NULL".
rsyslog-7.4.10/runtime/queue.c:2126: var_assigned: Assigning: "pThis->mut" = null return value from "malloc(size_t)".
rsyslog-7.4.10/runtime/queue.c:2127: dereference: Dereferencing a pointer that might be null "pThis->mut" when calling "pthread_mutex_init(pthread_mutex_t *, pthread_mutexattr_t const *)".
2014-07-22 17:45:49 +02:00
Rainer Gerhards
a45ea8a144 testbench: make more reliable shutdown
so far, we checked only the main queue size to become zero, ignoring
the sizes of action queues. For some tests, this caused racieness and
unreliability. Now, we check all queues. This should make matters
much more stable.
2014-07-11 17:23:21 +02:00
Rainer Gerhards
93cf514504 Merge branch 'v7-stable' into v8-stable 2014-05-28 12:13:27 +02:00
Rainer Gerhards
8e81842a4d fix compiler warnings on 64bit platforms 2014-05-28 12:12:31 +02:00
Rainer Gerhards
77d3142c61 Merge branch 'v7-devel' 2013-12-10 09:54:43 +01:00
Rainer Gerhards
dcee4926b5 re-enable legacy $WorkDir for queue spool directory use 2013-12-09 15:40:20 +01:00
Rainer Gerhards
292c4fe1b2 regression fix: read queue spool directory after config file has been processed
note that this does not yet support legacy style $WorkDir
2013-12-09 14:56:53 +01:00
Rainer Gerhards
08ea995494 Merge branch 'v7-devel' 2013-12-05 09:03:45 +01:00
Rainer Gerhards
8aeeda6d80 Merge branch 'v7-stable' into v7-devel 2013-12-05 09:03:34 +01:00
Karol Jurak
f6000c70fb bugfix: limiting queue disk space did not work properly 2013-12-05 08:58:04 +01:00
Rainer Gerhards
83dc432503 Merge branch 'v7-devel' 2013-12-01 12:51:11 +01:00
Rainer Gerhards
0d09f78ba8 emit warning message if queue full delay mark is below high wtr mark 2013-12-01 10:34:14 +01:00
Rainer Gerhards
f03431a834 regression fix: action queues with default settings did not start worker thread 2013-11-25 09:40:53 +01:00
Rainer Gerhards
ee4553948e Merge branch 'v7-devel'
Conflicts:
	runtime/queue.c
2013-11-21 12:15:44 +01:00
Rainer Gerhards
639afa3d0a queue: dynamic default for discardMark, emit warning if set very low 2013-11-21 12:00:41 +01:00
Rainer Gerhards
b72a26b304 queue: guard various config param defaults against very low queue sizes 2013-11-21 11:34:33 +01:00
Rainer Gerhards
712cceda93 Merge branch 'v7-devel' 2013-11-21 11:16:06 +01:00
Rainer Gerhards
5529113265 queue: add config parameter queue.spooldirectory
Conflicts:

	runtime/queue.c
2013-11-21 11:14:13 +01:00
Rainer Gerhards
ba92b0e497 Merge branch 'v7-stable' into v7-devel
Conflicts:
	runtime/queue.c
2013-11-21 11:13:26 +01:00
Rainer Gerhards
778568eb79 queue: spool directory setting was not properly propagated to DA queue 2013-11-21 11:02:41 +01:00
Rainer Gerhards
c6828f7a5d refactor queue spool directory config handling 2013-11-21 11:01:10 +01:00
Rainer Gerhards
ede2e4ccf2 regression fix: prevent queue stall if ratelimiter is used
Thanks to Pavel Levshin for alerting us. This regression was introduced
roughly 2 hours ago and was never released.
2013-11-20 17:01:39 +01:00
Rainer Gerhards
d7a0899203 regression fix: action queues with default settings did not start workers
This was introduced yesterday and has not been part of any released version.
2013-11-20 16:01:42 +01:00
Rainer Gerhards
1a16c3eb73 Merge branch 'v7-devel' 2013-11-19 18:30:51 +01:00
Rainer Gerhards
3ed275481f bugfix: legacy directive $ActionQueueWorkerThreads was not honored
Conflicts:

	ChangeLog
	runtime/queue.c
2013-11-19 18:30:13 +01:00
Rainer Gerhards
98e5663055 queue.workerThreadMinimumMessage set to queue.size / num workers 2013-11-19 18:20:18 +01:00
Rainer Gerhards
020fe0dcc4 bugfix: legacy directive $ActionQueueWorkerThreads was not honored 2013-11-19 18:18:10 +01:00
Rainer Gerhards
cdce0bde4b queue: auto-adjust watermarks 2013-11-19 17:46:19 +01:00
Rainer Gerhards
88fa72fef9 queue: warn if high watermark is set too low 2013-11-19 17:33:41 +01:00
Rainer Gerhards
23278699e3 Merge branch 'master-ruleeng' into master-ruleeng-simd 2013-11-07 12:57:49 +01:00
Rainer Gerhards
fb81cf202c Merge branch 'master' into master-ruleeng
Conflicts:
	runtime/wti.c
	runtime/wti.h
2013-11-07 12:57:36 +01:00
Pavel Levshin
ded6957225 bugfix: regular workers are no longer started if DA worker is active
form mail:
Look, below, if it is time to activate DA worker, we call it explicitly. But in this case we do not advise regular workers. They are likely already running at this point, but it is not guaranteed. What if, for example, the system is set to start additional workers when the queue is going over high watermark? What if HighWatermark is set to 1? Regular workers will not be started, and DA worker may fail. Thus, it is reasonable to advise regular workers even if we are going DA.
2013-11-07 12:42:37 +01:00
Rainer Gerhards
248e6bf819 cleanup no longer needed code 2013-11-07 12:25:46 +01:00
Rainer Gerhards
8752ce5a2e do not adjust batch size for disk queues 2013-11-07 10:28:42 +01:00
Rainer Gerhards
6a27cd816c do not complain for queue size on DA queues 2013-11-07 10:28:22 +01:00
Rainer Gerhards
3f258be416 do not adjust batch size for disk queues 2013-11-07 08:57:16 +01:00
Rainer Gerhards
4f88aa20b4 do not complain for queue size on DA queues 2013-11-06 19:06:27 +01:00
Rainer Gerhards
86589acdf9 Merge branch 'master-ruleeng' into master-ruleeng-simd 2013-11-05 18:23:02 +01:00
Rainer Gerhards
80a4feb542 Merge branch 'master' into master-ruleeng 2013-11-05 18:22:45 +01:00
Rainer Gerhards
f45297ed9b Merge branch 'v7-stable' 2013-11-05 18:22:34 +01:00
Rainer Gerhards
7906ee389c improved checking of queue config parameters on startup 2013-11-05 18:22:21 +01:00
Rainer Gerhards
a056dad8b3 emit warning message if queue.size is set dangerously low 2013-11-05 18:13:02 +01:00
Rainer Gerhards
962656afab cleanup no longer used code 2013-11-05 17:53:52 +01:00
Rainer Gerhards
e51de9f416 re-enable main queue direct mode 2013-11-05 17:47:35 +01:00
Rainer Gerhards
9b2e8c53fd refactor bShutdownImmediate handling 2013-11-05 12:24:29 +01:00
Rainer Gerhards
28b174e73c remove no longer needed code 2013-11-05 12:03:08 +01:00