summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bugfix: mmnormalize build problemsRainer Gerhards2012-11-272-6/+6
|
* prepare 7.3.4 releasev7.3.4Rainer Gerhards2012-11-254-3/+16
|
* Merge branch 'v7-stable'Rainer Gerhards2012-11-222-0/+5
|\
| * 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-1/+1
| | |
* | | Merge branch 'v7-stable'Rainer Gerhards2012-11-221-15/+23
|\| |
| * | 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: add new options to imklog doc pageMarius Tomaschewski2012-11-221-21/+19
| | | |
* | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-2221-52/+187
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/bsd.c plugins/imklog/imklog.c plugins/imklog/imklog.h
| * | | 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.
* | | | Merge branch 'master-newqueue'Rainer Gerhards2012-11-195-67/+105
|\ \ \ \
| * | | | queue: file delete stream does no longer do real ioRainer Gerhards2012-11-195-67/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This stream is primarily used for state tracking, and has been modified to do just that. This results in considerable less io being done and the respective speedup.
* | | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-1414-26/+65
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | bugfix: potential segfault at startup with property-based filterRainer Gerhards2012-11-143-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the property name was followed by a space before the comma, rsyslogd aborted on startup. Note that no segfault could happen if the initial startup went well (this was a problem with the config parser). closes: http://bugzilla.adiscon.com/show_bug.cgi?id=381
| * | | | bugfix: garbled message if field name was used with jsonf property optionRainer Gerhards2012-11-142-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The length for the field name was invalidly computed, resulting in either truncated field names or including extra random data. If the random data contained NULs, the rest of the message became unreadable. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=374
| * | | | silence compiler warnings & some cleanupRainer Gerhards2012-11-143-7/+4
| | | | |
| * | | | doc: describe leading space problem with "startswith" comparisonRainer Gerhards2012-11-142-3/+9
| | | | |
| * | | | bugfix: invalid formatting of man pagebjarniig@rhi.hi.is2012-11-141-4/+4
| | | | |
| * | | | bugfix: very small memory leak in imrelpRainer Gerhards2012-11-141-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 againGuillem Jover2012-11-144-3/+8
| | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=380
| * | | | Fix the rsyslogd man page formatting for the -d flagGeorgi Georgiev2012-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The indentation around the "-d" flag description is in the wrong place and does not display properly.
| * | | | make sure inaccessible config file is not tried to be processedRainer Gerhards2012-11-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The processing loop was not terminated when an unaccessible file was detected, and so processing was done using unitialized data, which could lead to all sorts of problems. Also did some minor cleanup.
| * | | | Silently ignore wildcard includes that match nothingGeorgi Georgiev2012-11-131-4/+16
| | | | | | | | | | | | | | | | | | | | This will avoid an error message when including an empty directory.
* | | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-135-99/+232
|\| | | |
| * | | | Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-11-132-1/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 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
| | | | |
| * | | | doc: upgrade ruleset doc to v7 config systemKonstantin Schmitt2012-11-123-98/+227
| | | | |
* | | | | Merge branch 'v7-stable'Rainer Gerhards2012-11-0914-42/+134
|\| | | |