Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-18 | 1 | -3/+3 |
|\ | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/glbl.c tools/omdiscard.c | ||||
| * | bugfix: very long running actions could prevent shutdown under some ↵ | Rainer Gerhards | 2011-02-11 | 1 | -3/+3 |
| | | | | | | | | | | | | circumstances This has now been solved, at least for common situations. | ||||
* | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-11 | 5 | -54/+330 |
|\| | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | fixed some compile issues in recent systemd patch | Rainer Gerhards | 2011-02-11 | 1 | -2/+2 |
| | | |||||
| * | Improved systemd socket activation support | Marius Tomaschewski | 2011-02-11 | 1 | -44/+45 |
| | | | | | | | | | | | | Support for multiple unix sockets and activation in forking mode Signed-off-by: Marius Tomaschewski <mt@suse.de> | ||||
| * | bugfix in pmsnare | David Lang | 2011-02-11 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | when removing text from the message, decrement the length when you increment the pointer through the message. there were a number of places where this was missed. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | enhanced imfile to support non-cancel input termination | Rainer Gerhards | 2011-02-10 | 1 | -6/+16 |
| | | |||||
| * | pmcisconames: bugfix for short timestamps | David Lang | 2011-02-10 | 1 | -4/+23 |
| | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | added pmsnare parser module | David Lang | 2011-02-08 | 2 | -0/+241 |
| | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | bugfix/omhdfs: directive $OMHDFSFileName rendered unusable | Rainer Gerhards | 2011-02-04 | 1 | -1/+1 |
| | | | | | | | | ...due to a search and replace-induced bug ;) | ||||
* | | fixed some regressions in imptcp | Rainer Gerhards | 2011-02-01 | 1 | -2/+11 |
| | | | | | | | | from new changes, so far unreleased versions | ||||
* | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-02-01 | 8 | -39/+519 |
|\| | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/imudp/imudp.c plugins/ommysql/ommysql.c | ||||
| * | added pmaixforwardedfrom message parser | David Lang | 2011-02-01 | 2 | -0/+175 |
| | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | added $OMMySQLConfigFile/$OMMySQLConfigSection config directives | Ariel P | 2011-01-31 | 1 | -0/+39 |
| | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | Merge branch 'v5-devel-david-imfile' into v5-devel | Rainer Gerhards | 2011-01-26 | 1 | -1/+7 |
| |\ | |||||
| | * | enhanced imfile to support multi-line messages | David Lang | 2011-01-25 | 1 | -1/+7 |
| | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | pmciscomsg: fixed some problems | David Lang | 2011-01-25 | 1 | -4/+9 |
| | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | added pmcisconames (uncompiled & untested) | David Lang | 2011-01-13 | 2 | -0/+161 |
| |/ | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | Merge branch 'v5.6.2-newimudp' into v5-devel-newimudp | Rainer Gerhards | 2011-01-10 | 2 | -2/+137 |
| |\ | | | | | | | | | | | | | | | | Conflicts: plugins/imudp/imudp.c threads.c | ||||
| | * | improved imudp real-time scheduling support & bugfix | Dražen Kačar | 2011-01-10 | 2 | -1/+136 |
| | | | | | | | | | | | | | | | | | | | | | The original code had quite some issues, which are fixed by this commit. Also we do more error checking now. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | Merge branch 'v4-devel' into v5-devel-newimudp | Rainer Gerhards | 2011-01-10 | 1 | -42/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac plugins/imudp/imudp.c | ||||
| | * | | imudp: removing new scheduling priority setting code | Rainer Gerhards | 2011-01-10 | 1 | -42/+0 |
| | | | | | | | | | | | | | | | | | | | | as it had too many implications. This will now be part of v5 only. | ||||
| | * | | added support for systems without epoll_create1() | Rainer Gerhards | 2010-12-17 | 1 | -1/+19 |
| | | | | |||||
* | | | | experimental support for monogodb added | Victor Pereira | 2011-01-31 | 3 | -0/+314 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | cleanup of imptcp; doc added; config statement for workers added | Rainer Gerhards | 2011-01-31 | 1 | -23/+17 |
| | | | | |||||
* | | | | added multi-threading support to imptcp | Rainer Gerhards | 2011-01-28 | 1 | -47/+182 |
| | | | | |||||
* | | | | small speedup to imptcp: read more than one events in epoll call | Rainer Gerhards | 2011-01-28 | 1 | -1/+2 |
| | | | | |||||
* | | | | imptcp now supports non-cancel termination mode, a plus in stability | Rainer Gerhards | 2011-01-28 | 1 | -15/+13 |
| | | | | |||||
* | | | | abandon imttcp, concept failed, explanation comment added to module | Rainer Gerhards | 2011-01-24 | 1 | -0/+53 |
| | | | | | | | | | | | | | | | | | | | | but will leave the module inside source tree as it may be useful for further testing ... maybe... ;) | ||||
* | | | | thread leak fixed (but not in a clean way) | Rainer Gerhards | 2011-01-24 | 1 | -2/+10 |
| | | | | |||||
* | | | | added first (very experimental) version of imttcp | Rainer Gerhards | 2011-01-24 | 2 | -0/+1089 |
| | | | | |||||
* | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-12-17 | 4 | -7/+59 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c | ||||
| * | | | Merge branch 'v4-devel' into v5-devel | Rainer Gerhards | 2010-12-17 | 2 | -4/+56 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html doc/manual.html plugins/imudp/imudp.c runtime/msg.h tools/syslogd.c | ||||
| | * | | added $IMUDPSchedulingPolicy and $IMUDPSchedulingPriority config settings | Rainer Gerhards | 2010-12-17 | 1 | -0/+42 |
| | | | | |||||
| | * | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2010-12-16 | 1 | -3/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/parser.c | ||||
| | * | | | Fix a potential missing '\0' on too long strings. | Luis Fernando Muñoz Mejías | 2010-11-30 | 1 | -4/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By implementing a trivial strlcpy it's much easier to detect string truncations and react to them. This also gives a noticeable speedup in buffer handling (can be HUGE), since strlcpy() doesn't clear all the buffer entry before writing data. Converted all uses of strncpy() into strlcpy(). Also, we don't need to check for some null pointers, as there are no malloc-like operations in the doAction loop. | ||||
| * | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2010-12-17 | 2 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * \ \ \ | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2010-12-16 | 1 | -3/+1 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 results | Rainer Gerhards | 2010-12-16 | 1 | -3/+1 |
| | | | | | | |||||
| | * | | | | bugfix: unitialized variable could cause issues under extreme conditions | Rainer Gerhards | 2010-12-16 | 1 | -0/+2 |
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | 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!) | ||||
* | | | | | Merge branch 'lognorm' + some doc added | Rainer Gerhards | 2010-12-13 | 2 | -0/+281 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | | milestone: added support for CEE-properties in property-based filters | Rainer Gerhards | 2010-12-01 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | milestone: template supports CEE output via %$!all-json% | Rainer Gerhards | 2010-12-01 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | mmnormalize loads & runs (basic testing done) | Rainer Gerhards | 2010-12-01 | 2 | -2/+14 |
| | | | | | | |||||
| * | | | | | milestone: added mmnormalize (compiles, but untested) | Rainer Gerhards | 2010-12-01 | 2 | -0/+269 |
|/ / / / / | |||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-11-25 | 2 | -1/+20 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| * | | | | Merge branch 'v5-beta' into v5-devel | Rainer Gerhards | 2010-11-25 | 2 | -1/+20 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/imfile.html plugins/imfile/imfile.c runtime/rsyslog.h | ||||
| | * | | | streamlined epoll_create() code a little bit | Rainer Gerhards | 2010-11-25 | 1 | -2/+5 |
| | | | | | |||||
| | * | | | fixed compile problem in imptcp if no epoll_create1() is present | David Hill | 2010-11-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | | | Merge branch 'v5.6.0a' into v5-stable | Rainer Gerhards | 2010-11-25 | 1 | -3/+17 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac |