summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-221-0/+2
|\
| * Fix linking for recent sd-daemon.c updateMartin Pitt2013-03-221-0/+2
| | | | | | | | | | | | | | | | | | The recent update of sd-daemon.c introduced the usage of mq_getattr(), which is shipped in -lrt (but clock_gettime isn't any more in glibc 2.17). Also check for mq_getattr() in the rt library to fix linking with glibc 2.17. http://bugzilla.adiscon.com/show_bug.cgi?id=428
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-212-37/+136
|\|
| * update systemd files to match current systemd sourceRainer Gerhards2013-03-212-37/+136
| |
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-201-13/+15
|\|
| * bugfix: get rid of potential endless loop in doGetGID()Tomas Heinrich2013-03-201-13/+15
| |
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-125-3/+9
|\| | | | | | | | | | | Conflicts: action.c queue.c (some code moved from action.c --> queue.c)
| * bugfix: divide action queue discard mark by 10 - was out of rangeTomas Heinrich2013-03-121-2/+2
| |
| * doc: mention last patch in ChangeLogRainer Gerhards2013-01-141-0/+2
| |
| * bugfix: decrement string lengthTomas Heinrich2013-01-141-1/+3
| |
| * tcpflood: properly terminate when sending small filesRainer Gerhards2013-01-141-0/+2
| |
* | 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)
* | 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
| |
* | 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).
* | 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".
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-11-221-12/+20
|\| | | | | | | | | Conflicts: ChangeLog
| * typo correctionRainer Gerhards2012-11-221-5/+5
| |
* | 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.
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-11-132-1/+5
|\| | | | | | | | | Conflicts: ChangeLog
| * add "EAGAIN" patch to ChangeLogRainer Gerhards2012-11-131-0/+4
| |
| * imuxsock: do not log EAGAIN in nonblocking recvfromMarius Tomaschewski2012-11-131-1/+1
| |
* | bugfix: $IncludeConfig did not correctly process directoriesRainer Gerhards2012-11-0911-20/+86
| | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=376 The testbench was also enhanced to check for these cases. Thanks to Georgi Georgiev for the bug report. Also minor bugfix: no error msg on unreadable $IncludeConfig path
* | bugfix: no error msg on invalid field option in legacy/string templateRainer Gerhards2012-11-082-1/+3
| |
* | doc: add recent patch (API) to ChangeLogRainer Gerhards2012-11-011-0/+3
| |
* | bugfix: invalid rsyslog-internal macro API useRainer Gerhards2012-11-0110-10/+10
| | | | | | | | | | This had no bad effect, because the macro did the same as the one that should have been used.
* | bugfix: misaddressing of $mmnormalizeuserawmsg parameterRainer Gerhards2012-11-012-1/+5
| | | | | | | | | | | | On many platforms, this has no effect at all. At some, it may cause a segfault. The problem occurs only during config phase, no segfault happens when rsyslog has fully started.
* | bugfix: build problems on some platformsRainer Gerhards2012-10-262-1/+4
| |
* | doc: fix html formattingMichael Biebl2012-10-251-2/+1
| |
* | preparing for 6.6.0v6.6.0Rainer Gerhards2012-10-225-7/+10
| |
* | Merge branch 'v6-beta' into v6-stableRainer Gerhards2012-10-2288-935/+7279
|\ \
| * \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-192-4/+4
| |\ \
| * | | doc: add imported bugfix to ChangeLogRainer Gerhards2012-10-191-0/+3
| | | |
| * | | Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-192-5/+1
| |\ \ \
| * \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-176-45/+22
| |\ \ \ \
| * \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-162-9/+11
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-112-1/+7
| |\ \ \ \ \ \
| * | | | | | | preparing for 6.5.1 releasev6.5.1Rainer Gerhards2012-10-113-3/+3
| | | | | | | |
| * | | | | | | remove some assert()'s - valgrind does a better job...Rainer Gerhards2012-10-111-4/+0
| | | | | | | |
| * | | | | | | fix small memory leak with string-type templatesRainer Gerhards2012-10-111-0/+1
| | | | | | | |
| * | | | | | | fix small memory leak when template is specified in omfileRainer Gerhards2012-10-111-0/+1
| | | | | | | |
| * | | | | | | re-enabled commented-out serialization support in debug handlerRainer Gerhards2012-10-111-3/+3
| | | | | | | |
| * | | | | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-045-29/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-044-0/+32
| |\ \ \ \ \ \ \ \
| * | | | | | | | | integrate logctl into build processRainer Gerhards2012-10-024-456/+482
| | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-04 07:04:37 +0000