summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master-localvars'Rainer Gerhards2013-07-204-53/+143
|\
| * make local vars work together with disk queuesRainer Gerhards2013-07-171-0/+8
| |
| * milestone: basic local variable functionality availableRainer Gerhards2013-07-174-13/+69
| | | | | | | | but some nits, like do not work with disk queues
| * refactor in preparation of local variablesRainer Gerhards2013-07-172-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 Gerhards2013-07-191-4/+4
|\ \
| * | debug: improve queue startup debug outputRainer Gerhards2013-07-191-4/+4
| | |
* | | Merge branch 'v7-stable'Rainer Gerhards2013-07-192-3/+2
|\| | | | | | | | | | | | | | Conflicts: runtime/stream.c
| * | Merge branch 'v6-stable' into tmpRainer Gerhards2013-07-192-3/+2
| |\ \
| | * \ Merge branch 'v5-stable' into tmpRainer Gerhards2013-07-192-3/+2
| | |\ \
| | | * | bugfix: correction to the interface of stream objTomas Heinrich2013-07-192-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 addedRainer Gerhards2013-07-193-4/+50
| | | | | | | | | | | | | | | | | | | | doc still missing
* | | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-191-2/+2
|\| | | |
| * | | | bugfix: $QHOUR/$HHOUR were always "00" or "01"Rainer Gerhards2013-07-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | regression some time between v5 and here Thanks to forum user rjmcinty for reporting this bug
* | | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-172-4/+7
|\| | | | | |_|_|/ |/| | |
| * | | regression fix: %d used for long long types in debug outputRainer Gerhards2013-07-171-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 destructionRainer Gerhards2013-07-171-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 presentRainer Gerhards2013-07-171-0/+1
| | | |
| * | | bugfix: CEE/json data was lost during disk queue operationRainer Gerhards2013-07-171-2/+1
| | | |
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-161-2/+26
|\| | |
| * | | add note on a potential future troublespotRainer Gerhards2013-07-161-1/+8
| | | |
| * | | Fixed return state handling in ConsumerDAAndre Lorbach2013-07-161-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 Gerhards2013-07-151-3/+15
|\| | |
| * | | fix regression that caused freeInstance not to be correctly calledRainer Gerhards2013-07-151-2/+2
| | | | | | | | | | | | | | | | was introduced July, 5th 2013 by commit 8ee2b0b1610fbf4dff20453d188f379583410b42
| * | | bugfix: 100% CPU utilization when DA queue became fullAndre Lorbach2013-07-151-3/+15
| | | |
* | | | fix regression that caused freeInstance not to be correctly calledRainer Gerhards2013-07-151-2/+2
| | | | | | | | | | | | | | | | was introduced July, 5th 2013 by commit 8ee2b0b1610fbf4dff20453d188f379583410b42
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-131-12/+12
|\| | |
| * | | nit: use correct function names in new debug instrumentationRainer Gerhards2013-07-131-12/+12
| | | |
| * | | Changed and extended debug output in queue/action classes for further analysisAndre Lorbach2013-07-131-6/+6
| | | |
| * | | Added header in typedefs.h needed for building on ehel 5Andre Lorbach2013-07-041-0/+4
| | | |
* | | | Merge branch 'c8'Rainer Gerhards2013-07-112-2/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/imudp.html plugins/imudp/imudp.c
| * | | | imudp: add ability to specify SO_RCVBUF size (rcvbufSize parameter)Rainer Gerhards2013-07-112-2/+35
| | | | |
* | | | | Merge branch 'v7-stable'Rainer Gerhards2013-06-271-0/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: doc/imfile.html
| * | | | bugfix: in RFC5425 TLS, multiple wildcards in auth could cause segfaultRainer Gerhards2013-06-271-0/+1
| | | | |
* | | | | Added header in typedefs.h needed for building on ehel 5Andre Lorbach2013-06-271-0/+4
| | | | |
* | | | | Merge branch 'v7-stable'Rainer Gerhards2013-06-251-2/+8
|\| | | |
| * | | | lmsig_gt: remove no longer needed error messageRainer Gerhards2013-06-251-2/+0
| | | | | | | | | | | | | | | | | | | | This is now properly handled inside rsyslog core.
| * | | | bugfix: lmsig_gt abort on invalid configuration parametersRisto Laanoja2013-06-251-2/+10
| | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=448
* | | | | Merge branch 'v7-stable'Rainer Gerhards2013-06-254-4/+6
|\| | | |
| * | | | build: fix issues on FreeBSDRainer Gerhards2013-06-253-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | The last fix was incomplete. Thanks to Christiano for testing and suggestions.
| * | | | typo fix ("listner" vs. "listener")Michael Biebl2013-06-251-1/+1
| | | | |
* | | | | Merge branch 'v7-stable'Rainer Gerhards2013-06-242-4/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | $uptime property: fix mem leak and build problems on FreeBSDRainer Gerhards2013-06-241-3/+27
| | | | |
| * | | | solve build problem on FreeBSDRainer Gerhards2013-06-241-1/+5
| | | | | | | | | | | | | | | | | | | | Thanks to Christiano for reporting this problem.
* | | | | omrelp: emit error message on peer authentication failureRainer Gerhards2013-06-211-0/+1
| | | | |
* | | | | Merge branch 'v7-stable'Rainer Gerhards2013-06-172-2/+18
|\| | | |
| * | | | imjournal fix: put ratelimiter destruction in wrong entry pointRainer Gerhards2013-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | No regression, this was in recently written, never-released code.
| * | | | implement new ratelimiting mode for imjournalRainer Gerhards2013-06-172-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 Gerhards2013-06-151-2/+2
|\| | | |
| * | | | bugfix: prevent calling tellLostCnt() twiceTomas Heinrich2013-06-121-1/+1
| | | | |
| * | | | bugfix: prevent another endless loop in the ratelimiterTomas Heinrich2013-06-121-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.