summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* silence some primarily cosmetic compiler warning messagesRainer Gerhards2012-11-281-2/+6
|
* bugfix: modules not (yet) supporting new conf format were not properly ↵Rainer Gerhards2012-11-281-1/+1
| | | | | | | | | 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" ;))
* refactor stream.h; fix some issues with last patchRainer Gerhards2012-11-152-25/+17
| | | | | | | | | | | | 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.
* bugfix: imfile discarded some file partsMilan Bartos2012-11-151-3/+24
| | | | | | | | | 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.
* bugfix: potential segfault at startup with property-based filterRainer Gerhards2012-11-141-1/+3
| | | | | | | 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
* silence compiler warnings & some cleanupRainer Gerhards2012-11-142-2/+3
|
* bugfix: make rsyslog compile on kfreebsd againGuillem Jover2012-11-141-2/+2
| | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=380
* enabled to build without libuuid, at loss of uuid functionalityRainer Gerhards2012-11-091-1/+9
| | | | | | this enables smoother builds on older systems that do not support libuuid. Loss of functionality should usually not matter too much as uuid support has only recently been added and is very seldom used.
* testbench: complex1.sh testcase failed on slower machinesRainer Gerhards2012-10-291-0/+1
| | | | ... due to too small timeout for enqueue processing --> messages got lost
* Improve syntax error messages by outputting the error tokenRainer Gerhards2012-10-271-1/+2
|
* cleanupRainer Gerhards2012-10-241-2/+0
|
* Merge branch 'v6-stable' into v7-stableRainer Gerhards2012-10-221-3/+3
|\ | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html template.c
| * preparing for 6.6.0v6.6.0Rainer Gerhards2012-10-221-1/+1
| |
| * Merge branch 'v6-stable' into v6-betaRainer Gerhards2012-10-191-2/+2
| |\
| * | re-enabled commented-out serialization support in debug handlerRainer Gerhards2012-10-111-3/+3
| | |
* | | prepare for 7.20 stable release & minor thingsv7.2.0Rainer Gerhards2012-10-221-1/+1
| | | | | | | | | | | | | | | | | | The most important real code chane is the initialization of the epoll control set. This should just be cosmetic (valgrind warnings), as all data we actually use already was properly initialized.
* | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-191-2/+2
|\ \ \ | | |/ | |/|
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-10-191-2/+2
| |\ \ | | | | | | | | | | | | | | | | Conflicts: runtime/nsdpoll_ptcp.c
| | * | fix epoll-enabled code to use correct data member for pointersRainer Gerhards2012-10-191-2/+2
| | | |
* | | | Fix crash when date properties are used without a templateMiloslav Trmač2012-10-111-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.g. in > set $!time = $timereported; > set $!time_rcvd = $timegenerated; pTpe is set to NULL by the caller. (Is "default" the correct format to use?) Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | added deprecated note to omrulesetRainer Gerhards2012-10-111-0/+1
| | | |
* | | | cosmetic: simplifyRainer Gerhards2012-10-111-3/+1
| | | |
* | | | add "parser" parameter to ruleset(), so that parser chain can be configuredRainer Gerhards2012-10-023-8/+33
| | | |
* | | | mmjsonparse: also add MSG part of message if CEE-parsing failsRainer Gerhards2012-10-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In that case, the CEE/lumberjack spec says MSG is NON-CEE and must be treated accordingly. This means no JSON parsing happens. The case is equal to missing CEE cookie. Also adapted module to new interfaces provided by msg object.
* | | | bugfix: ruleset(){} directive errornously changed default rulesetRainer Gerhards2012-10-013-5/+10
| | | | | | | | | | | | | | | | | | | | much like the $ruleset legacy conf statement. This potentially lead to statements being assigned to the wrong ruleset.
* | | | implement RainerScript "call" statementRainer Gerhards2012-10-011-0/+5
| | | |
* | | | cleanupRainer Gerhards2012-10-011-1/+0
| | | |
* | | | implement string arrays for config objectsRainer Gerhards2012-10-011-0/+1
| | | | | | | | | | | | | | | | | | | | as a tester, imudp now supports binding to multiple options based on a string array
* | | | Implement RainerScript ruleset() statementRainer Gerhards2012-09-284-3/+59
| | | |
* | | | somewhat better debug outputRainer Gerhards2012-09-281-1/+3
| | | |
* | | | cleanupRainer Gerhards2012-09-281-5/+1
| | | | | | | | | | | | | | | | | | | | recent enhancement in RainerScript param handlers permit to remove now-redundant code
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-276-13/+151
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c grammar/grammar.y runtime/modules.h runtime/rsconf.c
| * | | Do not load module if it had errorneous parametersRainer Gerhards2012-09-273-12/+58
| | | |
| * | | bugfix: config errors did not always cause statement to failRainer Gerhards2012-09-271-0/+2
| | | | | | | | | | | | | | | | This could lead to startup with invalid parameters.
| * | | cleanupRainer Gerhards2012-09-261-2/+0
| | | |
| * | | cleanupRainer Gerhards2012-09-261-3/+0
| | | |
| * | | input stmt: add core engine plumbingRainer Gerhards2012-09-265-1/+96
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-261-1/+0
|\| | |
| * | | minor cleanupRainer Gerhards2012-09-251-1/+0
| | | |
* | | | fix invalid state handling during action executionRainer Gerhards2012-09-251-2/+2
| | | | | | | | | | | | | | | | could lead to execution of not-to-be-executed action. very recent regression.
* | | | Merge branch 'master' into master-newrulesetRainer Gerhards2012-09-252-3/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/modules.c
| * | | | fix invalid free caused by optimized script executionRainer Gerhards2012-09-253-2/+5
| | | | |
* | | | | cosmetic: remove no-longer valid TODO itemRainer Gerhards2012-09-251-1/+0
| | | | |
* | | | | fix optimizer-introduced memleak in action destructionRainer Gerhards2012-09-251-61/+63
| | | | |
* | | | | cleanup & better debug outputRainer Gerhards2012-09-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | - removed no longer needed function - debug log now contains action type for action objects
* | | | | PoC: optimize omdicard --> STOPRainer Gerhards2012-09-242-1/+5
|/ / / /
* | | | Merge branch 'v6-devel' into master-newrulesetRainer Gerhards2012-09-231-7/+0
|\| | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-231-7/+0
| |\| | | | | | | | | | | | | | | | | | Conflicts: runtime/glbl.c
| | * | Remove no longer needed functionRainer Gerhards2012-09-231-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | Thanks to Andreas Stieger from Novell/SUSE for alerting us. This function was introduced as part of the new config system, but never was actually used (aka "not needed").
* | | | fix compile problem due to error in last commitRainer Gerhards2012-09-211-1/+0
| | | |