Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge branch 'v6-stable' into tmp | Rainer Gerhards | 2013-07-19 | 3 | -3/+5 | |
| |\ \ | ||||||
| | * \ | Merge branch 'v5-stable' into tmp | Rainer Gerhards | 2013-07-19 | 3 | -3/+5 | |
| | |\ \ | ||||||
| | | * | | doc: mention queue file size patch | Rainer Gerhards | 2013-07-19 | 1 | -0/+3 | |
| | | | | | ||||||
| | | * | | 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. | |||||
* | | | | | doc: add version requirement for main_queue() object | Rainer Gerhards | 2013-07-19 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | doc: add doc for main_queue() object | Rainer Gerhards | 2013-07-19 | 2 | -0/+13 | |
| | | | | | ||||||
* | | | | | cosmetic cleanup, remove left-over debug test aids | Rainer Gerhards | 2013-07-19 | 1 | -2/+0 | |
| | | | | | ||||||
* | | | | | main_queue() config object added | Rainer Gerhards | 2013-07-19 | 6 | -4/+58 | |
| | | | | | | | | | | | | | | | | | | | | doc still missing | |||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-07-19 | 2 | -2/+7 | |
|\| | | | | ||||||
| * | | | | bugfix: $QHOUR/$HHOUR were always "00" or "01" | Rainer Gerhards | 2013-07-19 | 2 | -2/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | regression some time between v5 and here Thanks to forum user rjmcinty for reporting this bug | |||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-07-19 | 1 | -1/+1 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | |||||
| * | | | | prepare for 7.4.3 releasev7.4.3 | Rainer Gerhards | 2013-07-18 | 3 | -3/+3 | |
| | | | | | ||||||
* | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-07-17 | 3 | -4/+12 | |
|\| | | | | |_|_|/ |/| | | | ||||||
| * | | | 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 | 2 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | 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 | 2 | -0/+2 | |
| | | | | ||||||
| * | | | bugfix: CEE/json data was lost during disk queue operation | Rainer Gerhards | 2013-07-17 | 2 | -2/+2 | |
| | | | | ||||||
* | | | | 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 | |||||
* | | | | cleanup | Rainer Gerhards | 2013-07-15 | 2 | -15/+0 | |
| | | | | ||||||
* | | | | Merge branch 'master' into master-zipflush | Rainer Gerhards | 2013-07-15 | 2 | -8/+9 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imptcp/imptcp.c | |||||
| * | | | | bugfix: stream compression in imptcp caused timestamp to be corrupted | Rainer Gerhards | 2013-07-15 | 2 | -7/+9 | |
| | | | | | ||||||
* | | | | | milestone: tcp stream compression support for transaction boundaries | Rainer Gerhards | 2013-07-15 | 3 | -10/+57 | |
|/ / / / | ||||||
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-07-15 | 2 | -3/+16 | |
|\| | | | ||||||
| * | | | fix regression that caused freeInstance not to be correctly called | Rainer Gerhards | 2013-07-15 | 3 | -4/+4 | |
| | | | | | | | | | | | | | | | | was introduced July, 5th 2013 by commit 8ee2b0b1610fbf4dff20453d188f379583410b42 | |||||
| * | | | bugfix: 100% CPU utilization when DA queue became full | Andre Lorbach | 2013-07-15 | 2 | -3/+16 | |
| | | | | ||||||
* | | | | fix regression that caused freeInstance not to be correctly called | Rainer Gerhards | 2013-07-15 | 3 | -4/+4 | |
| | | | | | | | | | | | | | | | | 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 | |
| | | | | ||||||
* | | | | Merge remote-tracking branch 'andre/v7-stats-scripts' into tmp | Rainer Gerhards | 2013-07-12 | 2 | -19/+58 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'master' into v7-stats-scripts | Andre Lorbach | 2013-07-12 | 7 | -9/+65 | |
| |\ \ \ \ | ||||||
| * | | | | | Removed commandline arg count limit from scripts | Andre Lorbach | 2013-07-12 | 2 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Added new option "chartscalcdelta" to generate charts with delta values ↵ | Andre Lorbach | 2013-07-11 | 2 | -11/+34 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of cumulative values. Also fixed reading outputfile parameter in statslog-graph.py script. | |||||
| * | | | | | Merge branch 'master' into v7-stats-scripts | Andre Lorbach | 2013-07-11 | 14 | -230/+476 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Added command line switch to generate bar charts in statslog-splitter.py | Andre Lorbach | 2013-07-05 | 1 | -6/+22 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'c8' | Rainer Gerhards | 2013-07-12 | 3 | -64/+196 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac plugins/imudp/imudp.c | |||||
| * | | | | | | imudp: add support for recvmmsg() | Rainer Gerhards | 2013-07-11 | 3 | -22/+59 | |
| | | | | | | | ||||||
| * | | | | | | imudp milestone: recvmmsg() now supported, but reads only a single msg | Rainer Gerhards | 2013-07-11 | 1 | -2/+62 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | obviously, as an end-result that would be brainless ;) | |||||
| * | | | | | | imudp: fix error message on socket error condition | Rainer Gerhards | 2013-07-11 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | imudp: refactor to use recvmsg() in preparation for recvmmsg() | Rainer Gerhards | 2013-07-11 | 1 | -10/+18 | |
| | | | | | | | ||||||
| * | | | | | | imudp: refactor in preparation of recvmmsg() enhancement | Rainer Gerhards | 2013-07-11 | 1 | -60/+77 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'c8' | Rainer Gerhards | 2013-07-11 | 7 | -9/+65 | |
|\| | | | | | | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/imudp.html plugins/imudp/imudp.c | |||||
| * | | | | | imudp: add ability to specify SO_RCVBUF size (rcvbufSize parameter) | Rainer Gerhards | 2013-07-11 | 7 | -16/+70 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'c8' | Rainer Gerhards | 2013-07-11 | 2 | -1/+60 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/impstats/impstats.c | |||||
| * | | | | | impstats: add process resource usage counters [via getrusage()] | Rainer Gerhards | 2013-07-11 | 2 | -1/+60 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-07-10 | 2 | -0/+4 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | doc: mention recent build system patch | Rainer Gerhards | 2013-07-10 | 1 | -0/+2 | |
| | | | | | | ||||||
| * | | | | | fix build on FreeBSD | Cristiano Rolim | 2013-07-10 | 1 | -0/+2 | |
| | | | | | |