summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add $!, $., $/ to RSYSLOG_DebugFormatRainer Gerhards2013-07-231-1/+1
| | | | Thanks to David Lang for the suggestion.
* Merge branch 'master-globalvars'Rainer Gerhards2013-07-238-24/+114
|\
| * doc: add global variablesRainer Gerhards2013-07-231-6/+28
| |
| * add proper sync to global variablesRainer Gerhards2013-07-231-3/+17
| |
| * fix: global&local variables could not be accessed via RainerScriptRainer Gerhards2013-07-232-4/+8
| | | | | | | | | | also, global variable pool did receive extra variables that did not belong to global pool (problem in last milestone commit)
| * first shot at global variables (without proper sync so far)Rainer Gerhards2013-07-226-14/+64
| |
* | Fixed bugid #464 in elasticsearch output moduleAndre Lorbach2013-07-231-0/+6
| | | | | | | | | | | | Added some libcurl options in checkConn to disable the bodyport of the request within this functions. Otherwise libcurl could have created a sigsegv when curl_easy_perform() was called.
* | Added check if mainqueue cfg ptr is NULL in glblDestructMainqCnfObj function ↵Andre Lorbach2013-07-231-1/+4
|/ | | | (glbl.c)
* update to newest version of stats scriptsAndre Lorbach2013-07-221-2/+226
|
* Started implementing statslog analyzer for impstatsAndre Lorbach2013-07-223-15/+73
| | | | This script will help finding unusual things in the impstats logs
* doc: document local variables and their distinction to message JSON propertiesRainer Gerhards2013-07-211-0/+20
|
* Merge branch 'master-localvars'Rainer Gerhards2013-07-206-59/+175
|\
| * make local vars work together with disk queuesRainer Gerhards2013-07-171-0/+8
| |
| * milestone: basic local variable functionality availableRainer Gerhards2013-07-176-18/+100
| | | | | | | | but some nits, like do not work with disk queues
| * refactor in preparation of local variablesRainer Gerhards2013-07-173-41/+67
| | | | | | | | | | 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-4/+41
|\| |
| * | bugfix: testbench tool chkseq did improperly report invalid fileRainer Gerhards2013-07-192-4/+41
| | | | | | | | | | | | | | | | | | This happened when permitted duplicate values existed in the very last lines, right before end-of-file. Thanks to Radu Gheorghe for reporting this bug.
* | | Merge branch 'v7-stable'Rainer Gerhards2013-07-193-3/+11
|\| | | | | | | | | | | | | | Conflicts: runtime/stream.c
| * | doc: mention queue file size patchRainer Gerhards2013-07-191-1/+4
| | |
| * | 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
|\| | |