Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master-localvars' | Rainer Gerhards | 2013-07-20 | 4 | -53/+143 |
|\ | |||||
| * | make local vars work together with disk queues | Rainer Gerhards | 2013-07-17 | 1 | -0/+8 |
| | | |||||
| * | milestone: basic local variable functionality available | Rainer Gerhards | 2013-07-17 | 4 | -13/+69 |
| | | | | | | | | but some nits, like do not work with disk queues | ||||
| * | refactor in preparation of local variables | Rainer Gerhards | 2013-07-17 | 2 | -40/+66 |
| | | | | | | | | | | local variables require a second json root; this refactoring makes sure we can basically use common functions for json handling | ||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-07-19 | 1 | -4/+4 |
|\ \ | |||||
| * | | debug: improve queue startup debug output | Rainer Gerhards | 2013-07-19 | 1 | -4/+4 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-07-19 | 2 | -3/+2 |
|\| | | | | | | | | | | | | | | Conflicts: runtime/stream.c | ||||
| * | | Merge branch 'v6-stable' into tmp | Rainer Gerhards | 2013-07-19 | 2 | -3/+2 |
| |\ \ | |||||
| | * \ | Merge branch 'v5-stable' into tmp | Rainer Gerhards | 2013-07-19 | 2 | -3/+2 |
| | |\ \ | |||||
| | | * | | bugfix: correction to the interface of stream obj | Tomas Heinrich | 2013-07-19 | 2 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The datatype of the argument to SetiMaxFileSize() was too small and could overflow. The SetMaxFileSize() interface wasn't used at all (possibly confused with SetiMaxFileSize()) and was dropped. | ||||
* | | | | | main_queue() config object added | Rainer Gerhards | 2013-07-19 | 3 | -4/+50 |
| | | | | | | | | | | | | | | | | | | | | doc still missing | ||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-07-19 | 1 | -2/+2 |
|\| | | | | |||||
| * | | | | bugfix: $QHOUR/$HHOUR were always "00" or "01" | Rainer Gerhards | 2013-07-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | regression some time between v5 and here Thanks to forum user rjmcinty for reporting this bug | ||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-07-17 | 2 | -4/+7 |
|\| | | | | |_|_|/ |/| | | | |||||
| * | | | regression fix: %d used for long long types in debug output | Rainer Gerhards | 2013-07-17 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | regression from recent DA queue bug fix set of patches; not present in any released code. | ||||
| * | | | cosmetic bugfix: file name buffer was not freed on disk queue destruction | Rainer Gerhards | 2013-07-17 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | This was an extremely small one-time per run memleak, so nothing of concern. However, it bugs under valgrind and similar memory debuggers. | ||||
| * | | | bugfix: memory leak if disk queues were used and json data present | Rainer Gerhards | 2013-07-17 | 1 | -0/+1 |
| | | | | |||||
| * | | | bugfix: CEE/json data was lost during disk queue operation | Rainer Gerhards | 2013-07-17 | 1 | -2/+1 |
| | | | | |||||
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-07-16 | 1 | -2/+26 |
|\| | | | |||||
| * | | | add note on a potential future troublespot | Rainer Gerhards | 2013-07-16 | 1 | -1/+8 |
| | | | | |||||
| * | | | Fixed return state handling in ConsumerDA | Andre Lorbach | 2013-07-16 | 1 | -2/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The queue full loop fix added a problem to the queue when rsyslog was shutdown. This problem has been corrected now. Conflicts: runtime/queue.c | ||||
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-07-15 | 1 | -3/+15 |
|\| | | | |||||
| * | | | fix regression that caused freeInstance not to be correctly called | Rainer Gerhards | 2013-07-15 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | was introduced July, 5th 2013 by commit 8ee2b0b1610fbf4dff20453d188f379583410b42 | ||||
| * | | | bugfix: 100% CPU utilization when DA queue became full | Andre Lorbach | 2013-07-15 | 1 | -3/+15 |
| | | | | |||||
* | | | | fix regression that caused freeInstance not to be correctly called | Rainer Gerhards | 2013-07-15 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | was introduced July, 5th 2013 by commit 8ee2b0b1610fbf4dff20453d188f379583410b42 | ||||
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-07-13 | 1 | -12/+12 |
|\| | | | |||||
| * | | | nit: use correct function names in new debug instrumentation | Rainer Gerhards | 2013-07-13 | 1 | -12/+12 |
| | | | | |||||
| * | | | Changed and extended debug output in queue/action classes for further analysis | Andre Lorbach | 2013-07-13 | 1 | -6/+6 |
| | | | | |||||
| * | | | Added header in typedefs.h needed for building on ehel 5 | Andre Lorbach | 2013-07-04 | 1 | -0/+4 |
| | | | | |||||
* | | | | Merge branch 'c8' | Rainer Gerhards | 2013-07-11 | 2 | -2/+35 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/imudp.html plugins/imudp/imudp.c | ||||
| * | | | | imudp: add ability to specify SO_RCVBUF size (rcvbufSize parameter) | Rainer Gerhards | 2013-07-11 | 2 | -2/+35 |
| | | | | | |||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-27 | 1 | -0/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: doc/imfile.html | ||||
| * | | | | bugfix: in RFC5425 TLS, multiple wildcards in auth could cause segfault | Rainer Gerhards | 2013-06-27 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Added header in typedefs.h needed for building on ehel 5 | Andre Lorbach | 2013-06-27 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-25 | 1 | -2/+8 |
|\| | | | | |||||
| * | | | | lmsig_gt: remove no longer needed error message | Rainer Gerhards | 2013-06-25 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | This is now properly handled inside rsyslog core. | ||||
| * | | | | bugfix: lmsig_gt abort on invalid configuration parameters | Risto Laanoja | 2013-06-25 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=448 | ||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-25 | 4 | -4/+6 |
|\| | | | | |||||
| * | | | | build: fix issues on FreeBSD | Rainer Gerhards | 2013-06-25 | 3 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The last fix was incomplete. Thanks to Christiano for testing and suggestions. | ||||
| * | | | | typo fix ("listner" vs. "listener") | Michael Biebl | 2013-06-25 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-24 | 2 | -4/+32 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | $uptime property: fix mem leak and build problems on FreeBSD | Rainer Gerhards | 2013-06-24 | 1 | -3/+27 |
| | | | | | |||||
| * | | | | solve build problem on FreeBSD | Rainer Gerhards | 2013-06-24 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | Thanks to Christiano for reporting this problem. | ||||
* | | | | | omrelp: emit error message on peer authentication failure | Rainer Gerhards | 2013-06-21 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-17 | 2 | -2/+18 |
|\| | | | | |||||
| * | | | | imjournal fix: put ratelimiter destruction in wrong entry point | Rainer Gerhards | 2013-06-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | No regression, this was in recently written, never-released code. | ||||
| * | | | | implement new ratelimiting mode for imjournal | Rainer Gerhards | 2013-06-17 | 2 | -1/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and make imjournal use it. The new mode is needed, as imjournal uses journal's timestamp as message generation time (which otherwise is when the message entered the system, and the ratelimiter uses this as current timestamp in order to save performance). It is debatable if imjournal is doing the right thing here. But it doesn't feel totally wrong. So let's safe that debate for later ;) | ||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-06-15 | 1 | -2/+2 |
|\| | | | | |||||
| * | | | | bugfix: prevent calling tellLostCnt() twice | Tomas Heinrich | 2013-06-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | bugfix: prevent another endless loop in the ratelimiter | Tomas Heinrich | 2013-06-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The message that reports how many messages were lost due to ratelimiting was sent before reseting the state that led to it. If it itself got ratelimited, this could lead to an endless loop. |