| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | bugfix: segfault on imuxsock startup if system log socket is used and no ↵ | Rainer Gerhards | 2012-11-29 | 1 | -0/+4 |
| | | | | | | | | ratelimiting supported. Happens only during initial config read phase, once this is over, everything works stable. | ||||
| * | bugfix: mmnormalize could abort rsyslog if config parameter was in error | Rainer Gerhards | 2012-11-28 | 1 | -1/+5 |
| | | |||||
| * | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-28 | 11 | -5/+21 |
| |\ | | | | | | | | | | | | | Conflicts: doc/imptcp.html plugins/mmjsonparse/mmjsonparse.c plugins/mmnormalize/mmnormalize.c | ||||
| | * | silence some primarily cosmetic compiler warning messages | Rainer Gerhards | 2012-11-28 | 2 | -3/+12 |
| | | | |||||
| | * | bugfix: modules not (yet) supporting new conf format were not properly ↵ | Rainer Gerhards | 2012-11-28 | 9 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | 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" ;)) | ||||
| | * | bugfix: supportoctetcountedframing parameter did not work in imptcp | Rainer Gerhards | 2012-11-25 | 1 | -1/+1 |
| | | | |||||
| * | | bugfix: mmnormalize build problems | Rainer Gerhards | 2012-11-27 | 1 | -6/+3 |
| | | | |||||
| * | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-22 | 3 | -17/+37 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/bsd.c plugins/imklog/imklog.c plugins/imklog/imklog.h | ||||
| | * | Merge branch 'v6-stable' into tmp | Rainer Gerhards | 2012-11-22 | 3 | -25/+49 |
| | |\ | |||||
| | | * | imklog: add new config params to module() parameter set | Rainer Gerhards | 2012-11-22 | 1 | -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-stable | Rainer Gerhards | 2012-11-22 | 3 | -25/+43 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 nanoseconds | Rainer Gerhards | 2012-11-22 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | ... 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 option | Marius Tomaschewski | 2012-11-21 | 3 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 option | Marius Tomaschewski | 2012-11-21 | 3 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | When enabled, the kernel [timestamp] remains at begin of each message, even it is used for the message time too. | ||||
| | * | | | minor cleanup | Rainer Gerhards | 2012-11-15 | 1 | -8/+0 |
| | | | | | |||||
| * | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-14 | 3 | -5/+10 |
| |\| | | | |||||
| | * | | | silence compiler warnings & some cleanup | Rainer Gerhards | 2012-11-14 | 1 | -5/+1 |
| | | | | | |||||
| | * | | | bugfix: very small memory leak in imrelp | Rainer Gerhards | 2012-11-14 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not a real problem (thus no ChangeLog entry): we leaked a few bytes for every relp listener, but only at rsyslogd TERMINATION - where obviously the OS does the cleanup. However, the leak could cause some confusion with memory checkers like valgrind. | ||||
| | * | | | bugfix: make rsyslog compile on kfreebsd again | Guillem Jover | 2012-11-14 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=380 | ||||
| * | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-13 | 1 | -1/+1 |
| |\| | | | |||||
| | * | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-13 | 1 | -1/+1 |
| | |\| | | |||||
| | | * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-11-13 | 1 | -1/+1 |
| | | |\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | | | * | imuxsock: do not log EAGAIN in nonblocking recvfrom | Marius Tomaschewski | 2012-11-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-02 | 1 | -3/+3 |
| |\| | | | |||||
| | * | | | bugfix: potential abort of imtcp on rsyslogd shutdown | Rainer Gerhards | 2012-11-02 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-01 | 8 | -8/+8 |
| | |\| | | |||||
| | | * | | bugfix: invalid rsyslog-internal macro API use | Rainer Gerhards | 2012-11-01 | 8 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | This had no bad effect, because the macro did the same as the one that should have been used. | ||||
| * | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-01 | 2 | -3/+5 |
| |\| | | | |||||
| | * | | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-01 | 1 | -1/+1 |
| | |\| | | |||||
| | | * | | bugfix: misaddressing of $mmnormalizeuserawmsg parameter | Rainer Gerhards | 2012-11-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | | * | | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 1 | -5/+0 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-17 | 2 | -3/+5 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-16 | 1 | -8/+2 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 1 | -6/+0 |
| | | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | bugfix: imzmq3 segfault with PULL subscription | Martin Nilsson | 2012-10-30 | 1 | -2/+4 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | mmnormalize: support for v6+ config interface added | Rainer Gerhards | 2012-11-01 | 1 | -29/+145 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | mmjsonparse: support for v6+ config interface added | Rainer Gerhards | 2012-11-01 | 1 | -5/+46 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | bugfix: invalid rsyslog-internal macro API use | Rainer Gerhards | 2012-11-01 | 8 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This had no bad effect, because the macro did the same as the one that should have been used. | ||||
| * | | | | | | | | | | Merge branch 'master-ratelimit' | Rainer Gerhards | 2012-10-30 | 12 | -165/+139 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | remove legacy API parseAndSubmitMessage() from imrelp | Rainer Gerhards | 2012-10-29 | 1 | -3/+21 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-24 | 1 | -13/+18 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/v7compatibility.html | ||||
| | * | | | | | | | | | | | imuxsock: use a default ratelimiter if none else applies | Rainer Gerhards | 2012-10-23 | 1 | -1/+9 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | imklog, impstats: support for new rate-limiting API added | Rainer Gerhards | 2012-10-19 | 2 | -6/+5 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'master' into master-ratelimit | Rainer Gerhards | 2012-10-19 | 8 | -28/+30 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | | | | | | | | | | omruleset: update to new message submit APIs/ratelimiter | Rainer Gerhards | 2012-10-18 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... with the notable exception, that this module actualy needs no rate-limiter by design! | ||||
| | * | | | | | | | | | | | | Merge branch 'beta' into master-ratelimit | Rainer Gerhards | 2012-10-16 | 1 | -7/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | | | | | | | | | | | imtcp: support for Linux-Type ratelimiting added | Rainer Gerhards | 2012-10-15 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | imdiag: add support for new (ratelimiting) msg submit interface | Rainer Gerhards | 2012-10-15 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | |||||
 |
index : rsyslog | |
| Modifications to rsyslog---see v3-stable-kaz branch | kaz@kylheku.com |
| summaryrefslogtreecommitdiffstats |