summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v4-stable' into tmpRainer Gerhards2011-03-091-1/+1
|\
| * bugfix: abort if imfile reads file line of more than 64KiBRainer Gerhards2011-02-101-1/+1
| | | | | | | | | | Thanks to Peter Eisentraut for reporting and analysing this problem. bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=221
* | backporting abort condition fix from 5.7.7Rainer Gerhards2011-03-021-1/+2
| |
* | bugfix: fixed a memory leak and potential abort conditionRainer Gerhards2011-02-252-10/+21
| | | | | | | | | | | | | | this could happen if multiple rulesets were used and some output batches contained messages belonging to more than one ruleset. fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=226 fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=218
* | bugfix: memory leak when $RepeatedMsgReduction on was usedRainer Gerhards2011-02-251-0/+5
| | | | | | | | bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=225
* | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-01-261-10/+11
|\|
| * imfile bugfix: potential duplication of log contentRainer Gerhards2011-01-101-13/+9
| | | | | | | | | | | | Under some circumstances an invalid truncation was detected. This code has now been removed, a file change (and thus resent) is only detected if the inode number changes.
| * forgot the actual patch with the last commit :(Rainer Gerhards2010-12-171-1/+1
| |
| * bugfix: imfile potentially duplicates linesRainer Gerhards2010-12-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This can happen when 0 bytes are read from the input file, and some writer appends data to the file BEFORE we check if a rollover happens. The check for rollover uses the inode and size as a criterion. So far, we checked for equality of sizes, which is not given in this scenario, but that does not indicate a rollover. From the source code comments: Note that when we check the size, we MUST NOT check for equality. The reason is that the file may have been written right after we did try to read (so the file size has increased). That is NOT in indicator of a rollover (this is an actual bug scenario we experienced). So we need to check if the new size is smaller than what we already have seen!
* | bug fixes in action processingRainer Gerhards2010-12-171-3/+8
| | | | | | | | | | | | | | | | | | - bugfix: action processor released mememory too early, resulting in potential issue in retry cases (but very unlikely due to another bug, which I also fixed -- only after the fix this problem here became actually visible). - bugfix: batches which had actions in error were not properly retried in all cases
* | bugfix: batch processing flagged invalid message as "bad" under some ↵Rainer Gerhards2010-12-163-9/+4
| | | | | | | | | | | | circumstances also fixed some cosmetic nits
* | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-12-165-12/+6
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/parser.c runtime/queue.c runtime/wtp.c template.c threads.c tools/syslogd.c
| * some cleanup based on clang static analyzer resultsRainer Gerhards2010-12-166-15/+8
| |
| * Merge branch 'v3-stable' into v4-stableRainer Gerhards2010-12-162-3/+3
| |\ | | | | | | | | | | | | Conflicts: ChangeLog
| | * improved some code based on clang static analyzer resultsRainer Gerhards2010-12-162-3/+3
| | |
* | | bugfix: unitialized variable could cause issues under extreme conditionsRainer Gerhards2010-12-162-2/+7
| | | | | | | | | | | | | | | | | | plus some minor nits. This was found after a clang static code analyzer analysis (great tool, and special thanks to Marcin for telling me about it!)
* | | bugfix: replacements for atomic operations for non-int sized types had problems.Rainer Gerhards2010-11-255-124/+192
| | | | | | | | | | | | | | | At least one instance of that problem could potentially lead to abort (inside omfile).
* | | bugfix: atomic increment for msg object may not work correct on all platforms.Chris Metcalf2010-11-251-1/+1
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-11-241-0/+17
|\| | | | | | | | | | | | | | Conflicts: configure.ac
| * | Merge branch 'v3-stable' into v4-stableRainer Gerhards2010-11-241-0/+17
| |\| | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| | * bugfix(important): problem in TLS handling could cause rsyslog to loopv3.22.3Rainer Gerhards2010-11-241-0/+17
| | | | | | | | | | | | | | | | | | ... in a tight loop, effectively disabling functionality and bearing the risk of unresponsiveness of the whole system. Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=194
* | | bugfix: compile failed with --enable-unlimited-selectvarmojfekoj2010-11-052-1/+1
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-10-192-2/+9
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac runtime/cfsysline.c tools/ompipe.c
| * | fixing some compile problems on FreeBSDRainer Gerhards2010-10-193-5/+12
| | |
* | | Merge branch 'v4-devel' into v5-betaRainer Gerhards2010-10-152-8/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am tests/tcpflood.c
| * | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-10-151-8/+8
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/stream.c
| | * | imfile: bugfixes in regard to large files (> 2GB)Rainer Gerhards2010-10-151-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: a couple of problems that imfile had on some platforms, namely Ubuntu (not their fault, but occured there) - bugfix: imfile utilizes 32 bit to track offset. Most importantly, this problem can not experienced on Fedora 64 bit OS (which has 64 bit long's!)
| * | | Merge branch 'v4-stable-imptcp' into tmpRainer Gerhards2010-08-111-0/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am configure.ac runtime/rsyslog.h tests/Makefile.am
| | * | | added imptcpRainer Gerhards2010-08-101-0/+4
| | |/ / | | | | | | | | | | | | | | | | imptcp is a simplified, Linux-specific and potentielly fast syslog plain tcp input plugin (NOT supporting TLS!)
| * | | solving an error ID collision with v5 buildRainer Gerhards2010-08-061-1/+1
| | | |
* | | | Merge branch 'v4-devel'Rainer Gerhards2010-08-061-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog Makefile.am configure.ac doc/rsyslog_conf_modules.html runtime/rsyslog.h tests/Makefile.am
| * | | added omuxsock, which permits to write message to local Unix socketsRainer Gerhards2010-08-061-0/+1
| | | | | | | | | | | | | | | | this is the counterpart to imuxsock, enabling fast local forwarding
* | | | Merge branch 'v4-devel' into masterRainer Gerhards2010-08-051-1/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-08-051-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | Merge branch 'v3-stable' into v4-stableRainer Gerhards2010-08-051-1/+1
| | |\| | | | | | | | | | | | | | | | | Conflicts: runtime/conf.c
| | | * program name filter ! in the configuration cannot be resetKiss Gabor (Bitman)2010-08-051-2/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | Merge branch 'v4-devel'Rainer Gerhards2010-07-051-0/+1
|\| | |
| * | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-07-051-0/+1
| |\| |
| | * | bugfix: segfault on HUP when "HUPIsRestart" was set to "on"varmojfekoj2010-07-051-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | Merge branch 'tmp' into concurrent-outputRainer Gerhards2010-06-242-6/+12
|\ \ \ \
| * | | | made hardcoded max string number persistentRainer Gerhards2010-06-242-6/+12
| | | | | | | | | | | | | | | | | | | | see commit for reasoning
* | | | | added missing support for systems without atomic instructionsRainer Gerhards2010-06-241-0/+15
|/ / / /
* | | | bugfix: "$ActionExecOnlyWhenPreviousIsSuspended on" was brokenRainer Gerhards2010-06-244-23/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that, as it looks, the directive was already broken in previous v5 versions. So while I solved what looked like a (intentional) regression from the performance tuning, I actually solved a previous regression as well ;) I have also added new test cases to the testbench in order to capture such problems in the future. This version does now look pretty good in shape.
* | | | fixed a couple of regressionsRainer Gerhards2010-06-235-34/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by implementing some code that was missing so far ;) as well as finding some real bugs. I also did some general cleanup, removing debug strings and such. This code should be fairly OK to use, except when "exec only when previous action was suspended" is used -- this is NOT yet re-implemented in the tuned engine.
* | | | milestone(BUGGY): batch now pushed down to actionRainer Gerhards2010-06-156-16/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | at least in important cases (not for non-direct action queues and some other minor things). This version is definitely buggy, but may be tried with success on a non-production system. I will continue to work on the correctness, but needed to commit now to get a baseline.
* | | | milestone commit(BUGGY): batch is now handed down to rule processingRainer Gerhards2010-06-105-36/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, the full batch is passed down to the rule, which then enqueues the elements as single messages. Note that this code has some known defects and needs more changes until it is correct again. This is primarily a commit to be able to return to a known-(somewhat)-good state.
* | | | some cleanupRainer Gerhards2010-06-102-0/+7
| | | | | | | | | | | | | | | | | | | | as well as some work in preparation of storing doAction params inside the batch
* | | | Merge branch 'concurrent-output' into tmpRainer Gerhards2010-06-104-21/+43
|\ \ \ \
| * | | | main msg q consumer now preprocesses messages before doing rule processingRainer Gerhards2010-06-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | things like ACL check and message parsing. This leads to a greater level of concurrent processing. Beware, though, that this commit duplicates some messages. May be a regression from this or an earlier commit. I will soon sort out.
| * | | | somewhat improved direct mode queue performanceRainer Gerhards2010-06-092-18/+41
| | | | | | | | | | | | | | | | | | | | | | | | | ... but only for batch enqueues. This will not help much with the current code, but will play well with upcoming changes.