summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bugfix: on termination, actions were incorrectly calledRainer Gerhards2012-12-202-7/+23
| | | | | | | The problem was that incomplete fiter evaluation was done *during the shutdown phase*. This affected only the LAST batches being processed. No problem existed during the regular run. Could usually only happen on very busy systems, which were still busy during shutdown.
* cosmetic: silence compiler warningRainer Gerhards2012-12-181-0/+4
|
* Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-12-172-0/+9
|\ | | | | | | | | Conflicts: plugins/omudpspoof/omudpspoof.c
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-12-172-1/+10
| |\
| | * bugfix[kind of]: omudpspoof discarded messages >1472 bytes (MTU size)Rainer Gerhards2012-12-172-1/+10
| | | | | | | | | | | | | | | it now truncates these message, but ensures they are sent. Note that 7.2.5+ will switch to fragmented UDP messages instead (up to 64K)
* | | omudpspoof: better debug outputRainer Gerhards2012-12-171-10/+14
| | |
* | | add extra debug info to tackle omudpspoof problemRainer Gerhards2012-12-171-0/+1
| | |
* | | doc: mention recent patches in ChangeLogRainer Gerhards2012-12-131-0/+7
| | |
* | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-12-132-1/+5
|\| |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-12-132-1/+5
| |\| | | | | | | | | | | | | Conflicts: ChangeLog
| | * bugfix: invalid DST handling under SolarisScott Severtson2012-12-132-1/+3
| | |
* | | build: link omelasticsearch against -lmMichael Biebl2012-12-132-1/+2
| | | | | | | | | | | | Use LT_LIB_M to find the math library which is needed for pow().
* | | build: drop obsolete --enable-pthreads configure switchMichael Biebl2012-12-131-18/+2
| | | | | | | | | | | | Building without pthreads support hasn't been support for a while.
* | | build: fix uuid configure checkMichael Biebl2012-12-131-3/+3
| | |
* | | prepare for 7.2.4v7.2.4Rainer Gerhards2012-12-073-3/+3
| | |
* | | doc: mention important up-merged patch in ChangeLogRainer Gerhards2012-12-071-0/+15
| | |
* | | Merge branch 'v6-stable-newmsglock' into v7-stable-newmsglockRainer Gerhards2012-12-065-167/+24
|\| | | | | | | | | | | | | | Conflicts: tools/syslogd.c
| * | bugfix: some message properties could be garbled due to race conditionRainer Gerhards2012-12-066-169/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happened only on very high volume systems, if the same message was being processed by two different actions. This was a regression caused by the new config processor, which did no longer properly enable msg locking in multithreaded cases. The bugfix is actually a refactoring of the msg locking code - we no longer do unlocked operations, as the use case for it has mostly gone away. It is potentially possible only at very low-end systems, and there the small additional overhead of doing the locking does not really hurt. Instead, the removal of that capability can actually slightly improve performance in common cases, as the code path is smaller and requires slightly less memory writes. That probably outperforms the extra locking overhead (which in the low-end case always happens in user space, without need for kernel support as we can always directly aquire the lock - there is no contention at all).
* | | permit RFC3339 timestamp in local log socket messagesSebastien Ponce2012-12-032-3/+9
| | | | | | | | | | | | Released under ASL 2.0, permission given via email.
* | | fix missing functionality: ruleset(){} could not specify ruleset queueRainer Gerhards2012-11-309-63/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "queue.xxx" parameter set was not supported, and legacy ruleset config statements did not work (by intention). The fix introduces the "queue.xxx" parameter set. It has some regression potential, but only for the new functionality. Note that using that interface it is possible to specify duplicate queue file names, which will cause trouble. This will be solved in v7.3, because there is a too-large regression potential for the v7.2 stable branch.
* | | silence compiler warningsRainer Gerhards2012-11-305-8/+29
| | | | | | | | | | | | | | | the changes do not affect actual code execution, just keep the compile log clean.
* | | fix display problem with some date-format template optionsRainer Gerhards2012-11-291-1/+7
| | |
* | | bugfix: template "type" parameter is mandatory (but was not)Rainer Gerhards2012-11-292-4/+6
| | |
* | | silence some primarily cosmetic compiler warning messagesRainer Gerhards2012-11-284-7/+22
| | |
* | | bugfix: modules not (yet) supporting new conf format were not properly ↵Rainer Gerhards2012-11-2811-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | registered This lead to a "module not found" error message instead of the to-be-expected "module does not support new style" error message. That invalid error message could be quite misleading and actually stop people from addressing the real problem (aka "go nuts" ;))
* | | doc: improve imptcp docRainer Gerhards2012-11-261-8/+10
| | |
* | | bugfix: supportoctetcountedframing parameter did not work in imptcpRainer Gerhards2012-11-252-1/+2
| | |
* | | Merge branch 'v6-stable' into tmpRainer Gerhards2012-11-222-0/+5
|\| |
| * | bugfix: hostname set in rsyslog.conf was not picked up until HUPoxpa2012-11-222-0/+5
| | | | | | | | | | | | which could also mean "never" or "not for a very long time".
* | | typo fixRainer Gerhards2012-11-221-3/+3
| | |
* | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-221-12/+20
|\| |
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-11-221-12/+20
| |\| | | | | | | | | | | | | Conflicts: ChangeLog
| | * typo correctionRainer Gerhards2012-11-221-5/+5
| | |
* | | doc: mention imported patches in ChangeLogRainer Gerhards2012-11-221-2/+12
| | |
* | | Merge branch 'v6-stable' into tmpRainer Gerhards2012-11-225-28/+97
|\| |
| * | imklog: add new config params to module() parameter setRainer Gerhards2012-11-221-0/+6
| | | | | | | | | | | | | | | This is based on Marius Tomaschewski's set of patches, mostly just applied manually (as I need to mangle with the merge).
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-11-225-28/+91
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: this was not a simple merge, I rather needed to adopt the v5 code to the new v6 config handling. However, no v6 config format has been added yet (this is the next step). Conflicts: plugins/imklog/imklog.c plugins/imklog/imklog.h
| | * bugfix: imklog mistakenly took kernel timestamp subseconds as nanosecondsRainer Gerhards2012-11-222-12/+27
| | | | | | | | | | | | | | | | | | ... actually, they are microseconds. So the fractional part of the timestamp was not properly formatted. Thanks to Marius Tomaschwesky for the bug report and the patch idea.
| | * imklog: added $klogParseKernelTimestamp optionMarius Tomaschewski2012-11-214-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | When enabled, kernel message [timestamp] is converted for message time. Default is to use receive time as in 5.8.x and before, because the clock used to create the timestamp is not supposed to be as accurate as the monotonic clock (depends on hardware and kernel) resulting in differences between kernel and system messages which occurred at same time.
| | * imklog: added $klogKeepKernelTimestamp optionMarius Tomaschewski2012-11-214-2/+13
| | | | | | | | | | | | | | | When enabled, the kernel [timestamp] remains at begin of each message, even it is used for the message time too.
* | | prepare for 7.2.3 releasev7.2.3Rainer Gerhards2012-11-213-3/+3
| | |
* | | testbench: bug fix & enhance $IncludeConfig testsRainer Gerhards2012-11-2010-10/+8
| | | | | | | | | | | | The bug fixes actually fixes a bug inside the *testbench* itself.
* | | improve $IncludeConfig error messagesRainer Gerhards2012-11-203-4/+31
| | |
* | | document fixed regressionRainer Gerhards2012-11-201-0/+12
| | |
* | | regression fix: rsyslog terminated when wild-card $includeFile did not find ↵Rainer Gerhards2012-11-201-2/+5
| | | | | | | | | | | | | | | | | | files Unfortunately, this is often the case by default in many distros.
* | | cleanupRainer Gerhards2012-11-201-1/+0
| | |
* | | prepare 7.2.2 releasev7.2.2Rainer Gerhards2012-11-164-5/+5
| | |
* | | refactor stream.h; fix some issues with last patchRainer Gerhards2012-11-153-26/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most importantly, the last patch for imfile contained a number of glitches, which are fixed by this commit (a memory leak under unusual conditions, partial message loss when rsyslog was terminated in the interim & mixing file data to the wrong files when multiple monitors were used [due to static variable]). The commit is actually a re-write of the patch, based on its core idea. Also some other minor cleanup was done.
* | | minor cleanupRainer Gerhards2012-11-151-8/+0
| | |
* | | bugfix: imfile discarded some file partsMilan Bartos2012-11-152-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | File lines that were incomplete (LF missing) *at the time imfile polled the file* were partially discarded. That part of the line that was read without the LF was discarded, and the rest of the line was submitted in the next polling cycle. This is now changed so that the partial content is saved until the complete line is read. Note that the patch affects only read mode 0.