summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | |
| * | | | | | | | | add new tool "logctl" to access lumberjack logs in MongoDBUlrike Gerhards2012-10-021-0/+456
| | | | | | | | | |
| * | | | | | | | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-022-1/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'v6-devel-input' into v6-develRainer Gerhards2012-09-288-153/+578
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | doc: update module doc to new config formatFlorian Riedl2012-09-285-107/+373
| | | | | | | | | | | |
| | * | | | | | | | | | imtcp: implement support for module() parametersRainer Gerhards2012-09-281-38/+135
| | | | | | | | | | | |
| | * | | | | | | | | | imptcp: implement support for module() parametersRainer Gerhards2012-09-271-7/+70
| | | | | | | | | | | |
| | * | | | | | | | | | fix whitespace issueRainer Gerhards2012-09-271-1/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'v6-devel-input' into v6-develRainer Gerhards2012-09-2716-244/+1173
| |\| | | | | | | | | |
| | * | | | | | | | | | Do not load module if it had errorneous parametersRainer Gerhards2012-09-273-12/+58
| | | | | | | | | | | |
| | * | | | | | | | | | cosmetic: remove irrelevant compiler warningRainer Gerhards2012-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v7 does not even have this code any longer
| | * | | | | | | | | | bugfix: config errors did not always cause statement to failRainer Gerhards2012-09-274-28/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could lead to startup with invalid parameters.
| | * | | | | | | | | | imfile: implement support for module parameters via module() stmtRainer Gerhards2012-09-272-9/+80
| | | | | | | | | | | |
| | * | | | | | | | | | yet another nitfix...Rainer Gerhards2012-09-271-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | nitfixRainer Gerhards2012-09-271-2/+2
| | | | | | | | | | | |
| | * | | | | | | | | | imfile: implement support for input()Rainer Gerhards2012-09-271-3/+78
| | | | | | | | | | | |
| | * | | | | | | | | | milestone: port imfile to v6 config systemRainer Gerhards2012-09-262-149/+279
| | | | | | | | | | | |
| | * | | | | | | | | | imrelp: implement support for input()Rainer Gerhards2012-09-261-10/+76
| | | | | | | | | | | |