summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-211-37/+135
|\
| * update systemd files to match current systemd sourceRainer Gerhards2013-03-211-37/+135
| |
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-201-13/+15
|\|
| * bugfix: get rid of potential endless loop in doGetGID()Tomas Heinrich2013-03-201-13/+15
| |
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2013-03-122-2/+4
|\| | | | | | | | | | | Conflicts: action.c queue.c (some code moved from action.c --> queue.c)
| * bugfix: decrement string lengthTomas Heinrich2013-01-141-1/+3
| |
* | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-12-131-1/+1
|\| | | | | | | | | Conflicts: ChangeLog
| * bugfix: invalid DST handling under SolarisScott Severtson2012-12-131-1/+1
| |
* | bugfix: some message properties could be garbled due to race conditionRainer Gerhards2012-12-062-149/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happened only on very high volume systems, if the same message was being processed by two different actions. This was a regression caused by the new config processor, which did no longer properly enable msg locking in multithreaded cases. The bugfix is actually a refactoring of the msg locking code - we no longer do unlocked operations, as the use case for it has mostly gone away. It is potentially possible only at very low-end systems, and there the small additional overhead of doing the locking does not really hurt. Instead, the removal of that capability can actually slightly improve performance in common cases, as the code path is smaller and requires slightly less memory writes. That probably outperforms the extra locking overhead (which in the low-end case always happens in user space, without need for kernel support as we can always directly aquire the lock - there is no contention at all).
* | preparing for 6.6.0v6.6.0Rainer Gerhards2012-10-221-1/+1
| |
* | Merge branch 'v6-stable' into v6-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
| | |
* | | re-enabled commented-out serialization support in debug handlerRainer Gerhards2012-10-111-3/+3
| | |
* | | 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
| | |
* | | minor cleanupRainer Gerhards2012-09-251-1/+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").
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-1/+1
|\| |
| * | SimplifyRainer Gerhards2012-09-201-4/+1
| | |
| * | Added missing iRet handler code into CheckConnection() in netstrm.cAndre Lorbach2012-09-201-1/+4
| | |
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-201-0/+3
|\| | | | | | | | | | | | | | Conflicts: ChangeLog
| * | Fix missing Sysklogd templateMilan Bartos2012-09-201-0/+3
| | | | | | | | | | | | modified: runtime/rsconf.c
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-141-1/+1
|\| | | | | | | | | | | | | | Conflicts: runtime/rule.c
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-141-1/+1
| |\|
| | * Debug logging slightly improvedRainer Gerhards2012-09-141-1/+1
| | |
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-131-78/+83
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog grammar/rainerscript.c grammar/rainerscript.h runtime/rule.c
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-09-131-78/+83
| |\| | | | | | | | | | | | | Conflicts: runtime/rule.c
| | * bugfix: invalid property name in property-filter could cause abortRainer Gerhards2012-09-131-56/+63
| | | | | | | | | | | | | | | | | | ...if action chaining (& operator) was used http://bugzilla.adiscon.com/show_bug.cgi?id=355 Thanks to pilou@gmx.com for the bug report
* | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-066-10/+33
|\| |
| * | Fixed TCP CheckConnection handling in omfwd.c.Andre Lorbach2012-08-255-8/+17
| | | | | | | | | | | | Interface needed to be changed in lower stream classes. Syslog TCP Sending is now resumed properly.
| * | bugfix: omusrsmsg incorrect return state & config warning handlingRainer Gerhards2012-08-281-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During config file processing, Omusrmsg often incorrectly returned a warning status, even when no warning was present (caused by uninitialized variable). Also, the core handled warning messages incorrectly, and treated them as errors. As a result, omusrmsg (most often) could not properly be loaded. Note that this only occurs with legacy config action syntax. This was a regression caused by an incorrect merge in to the 6.3.x codebase. Thanks to Stefano Mason for alerting us of this bug.
* | | default outname for $!<property> is now without $! prefixRainer Gerhards2012-08-291-2/+2
| | | | | | | | | | | | also some type cleanup and simplification
* | | adapted Mirek's changes to new JSON passing modeRainer Gerhards2012-08-291-0/+1
| | | | | | | | | | | | | | | now the complete code (JSON passing & ommongodb) could be tested and passed the module tests made during development
* | | add OMSR_TPL_AS_JSON mode for output modules (interface only)Rainer Gerhards2012-08-292-4/+6
| | | | | | | | | | | | | | | | | | This patch does NOT contain any implementation, this will happen next. Thanks to Miloslav Trmac, who suggested a similar mode, which I based the JSON idea on.
* | | Merge branch 'master-uuid'Rainer Gerhards2012-08-273-3/+69
|\ \ \
| * | | made new uuid property threadsafeRainer Gerhards2012-08-261-15/+21
| | | |
| * | | add uuid property to message objectJérôme Renard2012-08-263-3/+63
| | | |
* | | | Merge branch 'master-newtemplate'Rainer Gerhards2012-08-272-3/+15
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Conflicts: runtime/msg.c
| * | | add capability to configure outname for constant (inside template)Rainer Gerhards2012-08-251-2/+2
| | | | | | | | | | | | | | | | also some cleanup
| * | | milestone: LIST-type templates work, but no all options yet presentRainer Gerhards2012-08-251-5/+6
| | | |
| * | | milestone: base plumbing for LIST-type templates mostly in placeRainer Gerhards2012-08-251-0/+1
| | | |
| * | | Merge branch 'master' into master-newtemplateRainer Gerhards2012-08-2510-34/+71
| |\ \ \
| * | | | v6 config/templates: legacy types are now supported via template()Rainer Gerhards2012-08-251-2/+2
| | | | |
| * | | | add base plumbing for template() config object to grammarRainer Gerhards2012-08-241-0/+10
| | | | |
* | | | | Merge branch 'v6-stable'Rainer Gerhards2012-08-261-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |