Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2013-03-21 | 1 | -37/+135 |
|\ | |||||
| * | update systemd files to match current systemd source | Rainer Gerhards | 2013-03-21 | 1 | -37/+135 |
| | | |||||
* | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2013-03-20 | 1 | -13/+15 |
|\| | |||||
| * | bugfix: get rid of potential endless loop in doGetGID() | Tomas Heinrich | 2013-03-20 | 1 | -13/+15 |
| | | |||||
* | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2013-03-12 | 2 | -2/+4 |
|\| | | | | | | | | | | | Conflicts: action.c queue.c (some code moved from action.c --> queue.c) | ||||
| * | bugfix: decrement string length | Tomas Heinrich | 2013-01-14 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-12-13 | 1 | -1/+1 |
|\| | | | | | | | | | Conflicts: ChangeLog | ||||
| * | bugfix: invalid DST handling under Solaris | Scott Severtson | 2012-12-13 | 1 | -1/+1 |
| | | |||||
* | | bugfix: some message properties could be garbled due to race condition | Rainer Gerhards | 2012-12-06 | 2 | -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.0 | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
|\ \ | |||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | Conflicts: runtime/nsdpoll_ptcp.c | ||||
| | * | fix epoll-enabled code to use correct data member for pointers | Rainer Gerhards | 2012-10-19 | 1 | -2/+2 |
| | | | |||||
* | | | re-enabled commented-out serialization support in debug handler | Rainer Gerhards | 2012-10-11 | 1 | -3/+3 |
| | | | |||||
* | | | Do not load module if it had errorneous parameters | Rainer Gerhards | 2012-09-27 | 3 | -12/+58 |
| | | | |||||
* | | | bugfix: config errors did not always cause statement to fail | Rainer Gerhards | 2012-09-27 | 1 | -0/+2 |
| | | | | | | | | | | | | This could lead to startup with invalid parameters. | ||||
* | | | cleanup | Rainer Gerhards | 2012-09-26 | 1 | -2/+0 |
| | | | |||||
* | | | cleanup | Rainer Gerhards | 2012-09-26 | 1 | -3/+0 |
| | | | |||||
* | | | input stmt: add core engine plumbing | Rainer Gerhards | 2012-09-26 | 5 | -1/+96 |
| | | | |||||
* | | | minor cleanup | Rainer Gerhards | 2012-09-25 | 1 | -1/+0 |
| | | | |||||
* | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-23 | 1 | -7/+0 |
|\| | | | | | | | | | | | | | | Conflicts: runtime/glbl.c | ||||
| * | | Remove no longer needed function | Rainer Gerhards | 2012-09-23 | 1 | -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-devel | Rainer Gerhards | 2012-09-20 | 1 | -1/+1 |
|\| | | |||||
| * | | Simplify | Rainer Gerhards | 2012-09-20 | 1 | -4/+1 |
| | | | |||||
| * | | Added missing iRet handler code into CheckConnection() in netstrm.c | Andre Lorbach | 2012-09-20 | 1 | -1/+4 |
| | | | |||||
* | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-20 | 1 | -0/+3 |
|\| | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | Fix missing Sysklogd template | Milan Bartos | 2012-09-20 | 1 | -0/+3 |
| | | | | | | | | | | | | modified: runtime/rsconf.c | ||||
* | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-14 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | Conflicts: runtime/rule.c | ||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-14 | 1 | -1/+1 |
| |\| | |||||
| | * | Debug logging slightly improved | Rainer Gerhards | 2012-09-14 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-13 | 1 | -78/+83 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog grammar/rainerscript.c grammar/rainerscript.h runtime/rule.c | ||||
| * | | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-09-13 | 1 | -78/+83 |
| |\| | | | | | | | | | | | | | Conflicts: runtime/rule.c | ||||
| | * | bugfix: invalid property name in property-filter could cause abort | Rainer Gerhards | 2012-09-13 | 1 | -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-devel | Rainer Gerhards | 2012-09-06 | 6 | -10/+33 |
|\| | | |||||
| * | | Fixed TCP CheckConnection handling in omfwd.c. | Andre Lorbach | 2012-08-25 | 5 | -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 handling | Rainer Gerhards | 2012-08-28 | 1 | -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 $! prefix | Rainer Gerhards | 2012-08-29 | 1 | -2/+2 |
| | | | | | | | | | | | | also some type cleanup and simplification | ||||
* | | | adapted Mirek's changes to new JSON passing mode | Rainer Gerhards | 2012-08-29 | 1 | -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 Gerhards | 2012-08-29 | 2 | -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 Gerhards | 2012-08-27 | 3 | -3/+69 |
|\ \ \ | |||||
| * | | | made new uuid property threadsafe | Rainer Gerhards | 2012-08-26 | 1 | -15/+21 |
| | | | | |||||
| * | | | add uuid property to message object | Jérôme Renard | 2012-08-26 | 3 | -3/+63 |
| | | | | |||||
* | | | | Merge branch 'master-newtemplate' | Rainer Gerhards | 2012-08-27 | 2 | -3/+15 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | Conflicts: runtime/msg.c | ||||
| * | | | add capability to configure outname for constant (inside template) | Rainer Gerhards | 2012-08-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | also some cleanup | ||||
| * | | | milestone: LIST-type templates work, but no all options yet present | Rainer Gerhards | 2012-08-25 | 1 | -5/+6 |
| | | | | |||||
| * | | | milestone: base plumbing for LIST-type templates mostly in place | Rainer Gerhards | 2012-08-25 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into master-newtemplate | Rainer Gerhards | 2012-08-25 | 10 | -34/+71 |
| |\ \ \ | |||||
| * | | | | v6 config/templates: legacy types are now supported via template() | Rainer Gerhards | 2012-08-25 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | add base plumbing for template() config object to grammar | Rainer Gerhards | 2012-08-24 | 1 | -0/+10 |
| | | | | | |||||
* | | | | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-26 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | | |