Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-11-22 | 1 | -12/+20 |
|\ | | | | | | | | | Conflicts: ChangeLog | ||||
| * | typo correction | Rainer Gerhards | 2012-11-22 | 1 | -5/+5 |
| | | |||||
* | | 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 | 5 | -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 nanoseconds | Rainer Gerhards | 2012-11-22 | 2 | -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 option | Marius Tomaschewski | 2012-11-21 | 4 | -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 option | Marius Tomaschewski | 2012-11-21 | 4 | -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-stable | Rainer Gerhards | 2012-11-13 | 2 | -1/+5 |
|\| | | | | | | | | | Conflicts: ChangeLog | ||||
| * | add "EAGAIN" patch to ChangeLog | Rainer Gerhards | 2012-11-13 | 1 | -0/+4 |
| | | |||||
| * | imuxsock: do not log EAGAIN in nonblocking recvfrom | Marius Tomaschewski | 2012-11-13 | 1 | -1/+1 |
| | | |||||
* | | bugfix: $IncludeConfig did not correctly process directories | Rainer Gerhards | 2012-11-09 | 11 | -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 template | Rainer Gerhards | 2012-11-08 | 2 | -1/+3 |
| | | |||||
* | | doc: add recent patch (API) to ChangeLog | Rainer Gerhards | 2012-11-01 | 1 | -0/+3 |
| | | |||||
* | | bugfix: invalid rsyslog-internal macro API use | Rainer Gerhards | 2012-11-01 | 10 | -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 parameter | Rainer Gerhards | 2012-11-01 | 2 | -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 platforms | Rainer Gerhards | 2012-10-26 | 2 | -1/+4 |
| | | |||||
* | | doc: fix html formatting | Michael Biebl | 2012-10-25 | 1 | -2/+1 |
| | | |||||
* | | preparing for 6.6.0v6.6.0 | Rainer Gerhards | 2012-10-22 | 5 | -7/+10 |
| | | |||||
* | | Merge branch 'v6-beta' into v6-stable | Rainer Gerhards | 2012-10-22 | 88 | -935/+7279 |
|\ \ | |||||
| * \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 2 | -4/+4 |
| |\ \ | |||||
| * | | | doc: add imported bugfix to ChangeLog | Rainer Gerhards | 2012-10-19 | 1 | -0/+3 |
| | | | | |||||
| * | | | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 2 | -5/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-17 | 6 | -45/+22 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-16 | 2 | -9/+11 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-11 | 2 | -1/+7 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | preparing for 6.5.1 releasev6.5.1 | Rainer Gerhards | 2012-10-11 | 3 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | remove some assert()'s - valgrind does a better job... | Rainer Gerhards | 2012-10-11 | 1 | -4/+0 |
| | | | | | | | | |||||
| * | | | | | | | fix small memory leak with string-type templates | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | fix small memory leak when template is specified in omfile | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | re-enabled commented-out serialization support in debug handler | Rainer Gerhards | 2012-10-11 | 1 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 5 | -29/+2 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 4 | -0/+32 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | integrate logctl into build process | Rainer Gerhards | 2012-10-02 | 4 | -456/+482 |
| | | | | | | | | | | |||||
| * | | | | | | | | | add new tool "logctl" to access lumberjack logs in MongoDB | Ulrike Gerhards | 2012-10-02 | 1 | -0/+456 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-02 | 2 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'v6-devel-input' into v6-devel | Rainer Gerhards | 2012-09-28 | 8 | -153/+578 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | doc: update module doc to new config format | Florian Riedl | 2012-09-28 | 5 | -107/+373 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | imtcp: implement support for module() parameters | Rainer Gerhards | 2012-09-28 | 1 | -38/+135 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | imptcp: implement support for module() parameters | Rainer Gerhards | 2012-09-27 | 1 | -7/+70 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | fix whitespace issue | Rainer Gerhards | 2012-09-27 | 1 | -1/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'v6-devel-input' into v6-devel | Rainer Gerhards | 2012-09-27 | 16 | -244/+1173 |
| |\| | | | | | | | | | | |||||
| | * | | | | | | | | | | Do not load module if it had errorneous parameters | Rainer Gerhards | 2012-09-27 | 3 | -12/+58 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | cosmetic: remove irrelevant compiler warning | Rainer Gerhards | 2012-09-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v7 does not even have this code any longer | ||||
| | * | | | | | | | | | | bugfix: config errors did not always cause statement to fail | Rainer Gerhards | 2012-09-27 | 4 | -28/+114 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could lead to startup with invalid parameters. | ||||
| | * | | | | | | | | | | imfile: implement support for module parameters via module() stmt | Rainer Gerhards | 2012-09-27 | 2 | -9/+80 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | yet another nitfix... | Rainer Gerhards | 2012-09-27 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | nitfix | Rainer Gerhards | 2012-09-27 | 1 | -2/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | imfile: implement support for input() | Rainer Gerhards | 2012-09-27 | 1 | -3/+78 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | milestone: port imfile to v6 config system | Rainer Gerhards | 2012-09-26 | 2 | -149/+279 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | imrelp: implement support for input() | Rainer Gerhards | 2012-09-26 | 1 | -10/+76 |
| | | | | | | | | | | | |