Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v6-stable' | Rainer Gerhards | 2012-01-09 | 1 | -5/+5 |
|\ | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-01-09 | 1 | -5/+5 |
| |\ | |||||
| | * | bugfix: instabilities when using RFC5424 header fields | Kaiwang Chen | 2012-01-09 | 1 | -5/+5 |
| | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-12-19 | 1 | -4/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c | ||||
| * | | | better performance for action stats & cleanup: removing debug prints | Rainer Gerhards | 2011-12-19 | 1 | -4/+0 |
| | |/ | |/| | |||||
* | | | Merge branch 'beta' | Rainer Gerhards | 2011-10-27 | 1 | -2/+2 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/v6compatibility.html | ||||
| * | | bugfix (kind of): removed numerical part from pri-text | Rainer Gerhards | 2011-10-21 | 1 | -2/+2 |
| | | | | | | | | | | | | see v6 compatibility document for reasons | ||||
* | | | Merge branch 'beta' | Rainer Gerhards | 2011-10-17 | 1 | -7/+45 |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-13 | 1 | -7/+45 |
| |\| | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | bugfix: race condition when extracting structured data and PROCID | Rainer Gerhards | 2011-10-13 | 1 | -3/+21 |
| | | | | | | | | | | | | same issue as previous commit for PROGNAME and APPNAME | ||||
| | * | bugfix: race condition when extracting program name and APPNAME | Rainer Gerhards | 2011-10-13 | 1 | -4/+24 |
| | | | | | | | | | | | | could lead to invalid characters e.g. in dynamic file names | ||||
| * | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-09-26 | 1 | -1/+0 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
* | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-09-26 | 1 | -1/+0 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/conf.c tools/omfile.c tools/omusrmsg.c | ||||
| * | | bugfix: omfile returns fatal error code for things that go really wrong | Rainer Gerhards | 2011-09-26 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | previously, RS_RET_RESUME was returned, which lead to a loop inside the rule engine as omfile could not really recover. | ||||
* | | | Merge branch 'beta' | Andre Lorbach | 2011-08-18 | 1 | -2/+10 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: runtime/queue.c | ||||
| * | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-18 | 1 | -2/+10 |
| |\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| | * | Added debug output into message parsers needed for bugtracking | Andre Lorbach | 2011-08-12 | 1 | -0/+5 |
| | | | | | | | | | | | | Changed version to 5.8.5-pre1 | ||||
| | * | bugfixes for tag emulation | Rainer Gerhards | 2011-08-11 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | - bugfix: potential hang condition during tag emulation - bugfix: too-early string termination during tag emulation | ||||
* | | | Merge branch 'beta' | Andre Lorbach | 2011-08-11 | 1 | -1/+1 |
|\| | | |||||
| * | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-11 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | Fixed BUG in MsgDup (msg.c), the NULL Byte was not copied for the SyslogTag | Andre Lorbach | 2011-08-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | The syslogtag of the duplicated message could get contain garbage at the end as the string terminating NULL Byte was missing. | ||||
| * | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-10 | 1 | -3/+10 |
| |\| | |||||
* | | | Merge branch 'v5-stable' | Andre Lorbach | 2011-08-10 | 1 | -3/+10 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'v5-stable-msgidfix' into v5-stable | Andre Lorbach | 2011-08-10 | 1 | -3/+10 |
| |\ \ | |||||
| | * | | Cosmetic change | Andre Lorbach | 2011-07-27 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fixed a stupid return bug introduced by the last commit | Andre Lorbach | 2011-07-27 | 1 | -1/+2 |
| | | | | |||||
| | * | | Experimentally added mutex lock in getMSGID in order to fix bug 275. | Andre Lorbach | 2011-07-26 | 1 | -3/+9 |
| | | | | |||||
* | | | | Merge branch 'beta' | Andre Lorbach | 2011-08-05 | 1 | -7/+9 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * | | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-05 | 1 | -7/+9 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | bugfix: potential misadressing in property replacer | Andre Lorbach | 2011-08-05 | 1 | -7/+9 |
| | |/ | |||||
* | | | some more cleanup | Rainer Gerhards | 2011-07-15 | 1 | -44/+0 |
| | | | | | | | | | | | | preparing for a new, higher performance, variant object type | ||||
* | | | even more cleanup ;) | Rainer Gerhards | 2011-07-11 | 1 | -99/+0 |
| | | | |||||
* | | | cosmetic updates | Rainer Gerhards | 2011-07-08 | 1 | -4/+2 |
| | | | |||||
* | | | milestone/[PARTWORK]: integrated all variable types (msg/sys/cee) | Rainer Gerhards | 2011-07-08 | 1 | -0/+42 |
| | | | |||||
* | | | milestone/[PARTWORK]: obtaining msg vars integrated, "==" works for strings | Rainer Gerhards | 2011-07-07 | 1 | -7/+48 |
|/ / | |||||
* | | added log classification capabilities (via mmnormalize & tags) | Rainer Gerhards | 2011-04-13 | 1 | -16/+13 |
| | | |||||
* | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-04-12 | 1 | -115/+117 |
|\| | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html plugins/imtcp/imtcp.c | ||||
| * | bugfix: race condition in deferred name resolution | Rainer Gerhards | 2011-04-08 | 1 | -115/+117 |
| | | | | | | | | | | | | Note that this actually is a very small change, but I needed to shuffle a lot of code around in order to make it compile (due to required define order...). | ||||
* | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-31 | 1 | -0/+9 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c | ||||
| * | enhance: added $BOM system property to ease writing byte order masks | Rainer Gerhards | 2011-03-22 | 1 | -0/+10 |
| | | |||||
* | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-03-01 | 1 | -1/+2 |
|\| | | | | | | | | | Conflicts: ChangeLog | ||||
| * | bugfix: potential abort condition when $RepeatedMsgReduction set to on | Rainer Gerhards | 2011-03-01 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | as well as potentially in a number of other places where MsgDup() was used. This only happened when the imudp input module was used and it depended on name resolution not yet had taken place. In other words, this was a strange problem that could lead to hard to diagnose instability. So if you experience instability, chances are good that this fix will help. | ||||
* | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-25 | 1 | -0/+10 |
|\| | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | added debug support for trying to find well-hidden bug | Rainer Gerhards | 2011-02-23 | 1 | -0/+10 |
| | | |||||
* | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-12-17 | 1 | -3/+1 |
|\| | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c | ||||
| * | 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 |
| | | | |||||
* | | | milestone: added support for CEE-variables to RainerScript | Rainer Gerhards | 2010-12-03 | 1 | -0/+57 |
| | | | |||||
* | | | milestone: added support for CEE-properties in property-based filters | Rainer Gerhards | 2010-12-01 | 1 | -6/+11 |
| | | | |||||
* | | | milestone: ability to use normalized names in templates | Rainer Gerhards | 2010-12-01 | 1 | -0/+37 |
| | | |