summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'v6-stable' into tmpRainer Gerhards2013-07-193-3/+5
| |\ \
| | * \ Merge branch 'v5-stable' into tmpRainer Gerhards2013-07-193-3/+5
| | |\ \
| | | * | doc: mention queue file size patchRainer Gerhards2013-07-191-0/+3
| | | | |
| | | * | 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.
* | | | | doc: add version requirement for main_queue() objectRainer Gerhards2013-07-191-0/+1
| | | | |
* | | | | doc: add doc for main_queue() objectRainer Gerhards2013-07-192-0/+13
| | | | |
* | | | | cosmetic cleanup, remove left-over debug test aidsRainer Gerhards2013-07-191-2/+0
| | | | |
* | | | | main_queue() config object addedRainer Gerhards2013-07-196-4/+58
| | | | | | | | | | | | | | | | | | | | doc still missing
* | | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-192-2/+7
|\| | | |
| * | | | bugfix: $QHOUR/$HHOUR were always "00" or "01"Rainer Gerhards2013-07-192-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | regression some time between v5 and here Thanks to forum user rjmcinty for reporting this bug
* | | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-191-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | | prepare for 7.4.3 releasev7.4.3Rainer Gerhards2013-07-183-3/+3
| | | | |
* | | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-173-4/+12
|\| | | | | |_|_|/ |/| | |
| * | | 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-172-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 presentRainer Gerhards2013-07-172-0/+2
| | | |
| * | | bugfix: CEE/json data was lost during disk queue operationRainer Gerhards2013-07-172-2/+2
| | | |
* | | | 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
* | | | cleanupRainer Gerhards2013-07-152-15/+0
| | | |
* | | | Merge branch 'master' into master-zipflushRainer Gerhards2013-07-152-8/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imptcp/imptcp.c
| * | | | bugfix: stream compression in imptcp caused timestamp to be corruptedRainer Gerhards2013-07-152-7/+9
| | | | |
* | | | | milestone: tcp stream compression support for transaction boundariesRainer Gerhards2013-07-153-10/+57
|/ / / /
* | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-152-3/+16
|\| | |
| * | | fix regression that caused freeInstance not to be correctly calledRainer Gerhards2013-07-153-4/+4
| | | | | | | | | | | | | | | | was introduced July, 5th 2013 by commit 8ee2b0b1610fbf4dff20453d188f379583410b42
| * | | bugfix: 100% CPU utilization when DA queue became fullAndre Lorbach2013-07-152-3/+16
| | | |
* | | | fix regression that caused freeInstance not to be correctly calledRainer Gerhards2013-07-153-4/+4
| | | | | | | | | | | | | | | | 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
| | | |
* | | | Merge remote-tracking branch 'andre/v7-stats-scripts' into tmpRainer Gerhards2013-07-122-19/+58
|\ \ \ \
| * \ \ \ Merge branch 'master' into v7-stats-scriptsAndre Lorbach2013-07-127-9/+65
| |\ \ \ \
| * | | | | Removed commandline arg count limit from scriptsAndre Lorbach2013-07-122-2/+2
| | | | | |
| * | | | | Added new option "chartscalcdelta" to generate charts with delta values ↵Andre Lorbach2013-07-112-11/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of cumulative values. Also fixed reading outputfile parameter in statslog-graph.py script.
| * | | | | Merge branch 'master' into v7-stats-scriptsAndre Lorbach2013-07-1114-230/+476
| |\ \ \ \ \
| * | | | | | Added command line switch to generate bar charts in statslog-splitter.pyAndre Lorbach2013-07-051-6/+22
| | | | | | |
* | | | | | | Merge branch 'c8'Rainer Gerhards2013-07-123-64/+196
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac plugins/imudp/imudp.c
| * | | | | | imudp: add support for recvmmsg()Rainer Gerhards2013-07-113-22/+59
| | | | | | |
| * | | | | | imudp milestone: recvmmsg() now supported, but reads only a single msgRainer Gerhards2013-07-111-2/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | obviously, as an end-result that would be brainless ;)
| * | | | | | imudp: fix error message on socket error conditionRainer Gerhards2013-07-111-1/+1
| | | | | | |
| * | | | | | imudp: refactor to use recvmsg() in preparation for recvmmsg()Rainer Gerhards2013-07-111-10/+18
| | | | | | |
| * | | | | | imudp: refactor in preparation of recvmmsg() enhancementRainer Gerhards2013-07-111-60/+77
| | | | | | |
* | | | | | | Merge branch 'c8'Rainer Gerhards2013-07-117-9/+65
|\| | | | | | | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog doc/imudp.html plugins/imudp/imudp.c
| * | | | | imudp: add ability to specify SO_RCVBUF size (rcvbufSize parameter)Rainer Gerhards2013-07-117-16/+70
| | | | | |
* | | | | | Merge branch 'c8'Rainer Gerhards2013-07-112-1/+60
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/impstats/impstats.c
| * | | | | impstats: add process resource usage counters [via getrusage()]Rainer Gerhards2013-07-112-1/+60
| | | | | |
* | | | | | Merge branch 'v7-stable'Rainer Gerhards2013-07-102-0/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | doc: mention recent build system patchRainer Gerhards2013-07-101-0/+2
| | | | | |
| * | | | | fix build on FreeBSDCristiano Rolim2013-07-101-0/+2
| | | | | |