| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'beta' | Rainer Gerhards | 2011-08-31 | 1 | -24/+22 |
| |\ | | | | | | | | | Conflicts: action.c | ||||
| | * | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-08-31 | 1 | -25/+23 |
| | |\ | |||||
| | | * | bugfix: mark message processing did not work correctly | Rainer Gerhards | 2011-08-31 | 1 | -25/+23 |
| | | | | |||||
| * | | | Merge branch 'beta' | Andre Lorbach | 2011-08-18 | 1 | -2/+15 |
| |\| | | | | | | | | | | | | | | Conflicts: runtime/queue.c | ||||
| | * | | Merge branch 'v5-stable' into beta | Andre Lorbach | 2011-08-18 | 1 | -2/+15 |
| | |\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| | | * | removed debug code from action.c and runtime/queue.c after testing | Andre Lorbach | 2011-08-18 | 1 | -17/+0 |
| | | | | |||||
| | | * | bugfix: fixed incorrect state handling for Discard Action (transactions) | Andre Lorbach | 2011-08-18 | 1 | -2/+32 |
| | | | | |||||
| * | | | milestone: queue-params are properly initialized for action queues | Rainer Gerhards | 2011-08-01 | 1 | -14/+15 |
| | | | | |||||
| * | | | milestone: generic action parameters parsed via new config system | Rainer Gerhards | 2011-08-01 | 1 | -27/+87 |
| | | | | |||||
| * | | | milestone: queue object now has a param handler for new conf interface | Rainer Gerhards | 2011-07-22 | 1 | -51/+37 |
| | | | | | | | | | | | | | ... and action queue defs use this new interface (but not yet the main queues) | ||||
| * | | | milestone: omfile basically gets its parameters via the new system | Rainer Gerhards | 2011-07-21 | 1 | -3/+20 |
| | | | | | | | | | | | | | | | | but not all syntax handlers are present (so it does not yet fully work). | ||||
| * | | | fixing minor memory leaks | Rainer Gerhards | 2011-07-21 | 1 | -0/+1 |
| | | | | |||||
| * | | | milestone: new output plugin interface call added | Rainer Gerhards | 2011-07-21 | 1 | -1/+5 |
| | | | | |||||
| * | | | milestone: done plumbing to call plugin create action instance entry point | Rainer Gerhards | 2011-07-20 | 1 | -0/+100 |
| | | | | |||||
| * | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-06-27 | 1 | -1/+6 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c tools/omfile.c | ||||
| | * \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-06-21 | 1 | -8/+12 |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| | * | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-06-16 | 1 | -47/+125 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| | * | | | | preparing for 5.9.0v5.9.0 | Rainer Gerhards | 2011-06-10 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | set queue name to aciton name (useful for impstats!) | Rainer Gerhards | 2011-06-07 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | so far untested, test follows | ||||
| * | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-06-21 | 1 | -47/+129 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/Makefile.am tests/manytcp-too-few-tls.sh | ||||
| | * | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-06-21 | 1 | -47/+129 |
| | |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tests/diag.sh tests/sndrcv_drvr.sh | ||||
| | | * | | | bugfix: problems in failover action handling | Rainer Gerhards | 2011-06-20 | 1 | -8/+12 |
| | | | |/ | | |/| | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=254 | ||||
| | | * | | failover problem was not totally solved, now (hopefully ;)) | Rainer Gerhards | 2011-06-16 | 1 | -27/+59 |
| | | | | | | | | | | | | | | | | | I overlooked a border case, which came up on a larger testbench run. | ||||
| | | * | | bugfix: problems in failover action handling | Rainer Gerhards | 2011-06-16 | 1 | -47/+93 |
| | | |/ | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=270 (not yet confirmed!) | ||||
| * | | | step: action queues now activated only AFTER privilege drop | Rainer Gerhards | 2011-05-02 | 1 | -1/+30 |
| | | | | |||||
| * | | | step: moved main message queue activation to after priv drop | Rainer Gerhards | 2011-04-27 | 1 | -1/+0 |
| | | | | |||||
| * | | | step: config handler setting from syslogd.c moved to rsconf.c | Rainer Gerhards | 2011-04-21 | 1 | -3/+5 |
| | | | | |||||
| * | | | milestone: templates are now in config object | Rainer Gerhards | 2011-04-19 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-31 | 1 | -31/+111 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c | ||||
| | * | bugfix: error return from strgen caused abort, now causes action to be ignored | Rainer Gerhards | 2011-03-29 | 1 | -1/+2 |
| | | | | | | | | | ...(just like a failed filter) | ||||
| | * | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2011-03-16 | 1 | -30/+109 |
| | |\ | | | | | | | | | | | | | Conflicts: tests/Makefile.am | ||||
| | | * | fixed a regression of last patch and some cleanup | Rainer Gerhards | 2011-03-16 | 1 | -14/+4 |
| | | | | |||||
| | | * | bugfix: failover did not work correctly if repeated msg reduction was on | Rainer Gerhards | 2011-03-16 | 1 | -30/+119 |
| | | | | | | | | | | | | | affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on | ||||
| | | * | bugfix(kind of): tell users that config graph can currently not be generated | Rainer Gerhards | 2011-03-08 | 1 | -1/+2 |
| | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=232 | ||||
| * | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-03-11 | 1 | -1/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh | ||||
| | * | | bugfix: discard action did not work under some circumstances | Rainer Gerhards | 2011-03-07 | 1 | -1/+2 |
| | | | | | | | | | | | | | fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=217 | ||||
| * | | | Merge branch 'v5-beta' | Rainer Gerhards | 2011-02-18 | 1 | -12/+13 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/glbl.c tools/omdiscard.c | ||||
| | * | | bugfix: minor race condition in action.c - considered cosmetic | Rainer Gerhards | 2011-02-17 | 1 | -12/+13 |
| | |/ | | | | | | | | | | | This is considered cosmetic as multiple threads tried to write exactly the same value into the same memory location without sync. The method has been changed so this can no longer happen. | ||||
| * | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-12-17 | 1 | -60/+72 |
| |\| | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c | ||||
| | * | bug fixes in action processing | Rainer Gerhards | 2010-12-17 | 1 | -49/+70 |
| | | | | | | | | | | | | | | | | | | | - bugfix: action processor released mememory too early, resulting in potential issue in retry cases (but very unlikely due to another bug, which I also fixed -- only after the fix this problem here became actually visible). - bugfix: batches which had actions in error were not properly retried in all cases | ||||
| | * | used a bit more stack (irrelevant) to gain a bit more performance... | Rainer Gerhards | 2010-12-16 | 1 | -1/+2 |
| | | | | | | | | | ... for large batches | ||||
| | * | bugfix: batch processing flagged invalid message as "bad" under some ↵ | Rainer Gerhards | 2010-12-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | circumstances also fixed some cosmetic nits | ||||
| * | | bugfix: potential abort when output modules with different parameter ... | Rainer Gerhards | 2010-12-03 | 1 | -1/+3 |
| | | | | | | | | | ... passing modes were used in configured output modules | ||||
| * | | bugfix: memory leak if different passing modes were used in actions | Rainer Gerhards | 2010-12-01 | 1 | -0/+8 |
| | | | |||||
| * | | milestone: added support for CEE-properties in property-based filters | Rainer Gerhards | 2010-12-01 | 1 | -1/+0 |
| | | | |||||
| * | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-11-25 | 1 | -1/+1 |
| |\| | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| | * | bugfix: replacements for atomic operations for non-int sized types had problems. | Rainer Gerhards | 2010-11-25 | 1 | -1/+1 |
| | | | | | | | | | | | At least one instance of that problem could potentially lead to abort (inside omfile). | ||||
| * | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-10-22 | 1 | -1/+1 |
| |\| | |||||
| | * | fixing a potentially uninitialized variablev5.6.0 | Rainer Gerhards | 2010-10-19 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into newconf | Rainer Gerhards | 2010-08-05 | 1 | -0/+1 |
| |\| | | | | | | | | | Conflicts: doc/manual.html | ||||
 |
index : rsyslog.git | |
| rsyslog development for Lumberjack - various unofficial and potentially rebased branches | Miloslav Trmac |
| summaryrefslogtreecommitdiffstats |