summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* imfile: support LF escaping in read mode 2Rainer Gerhards2013-09-101-6/+16
|
* imfile: support LF escaping in read mode 1Rainer Gerhards2013-09-102-6/+16
|
* impstats: implement parameter "resetCounters"Rainer Gerhards2013-09-092-14/+15
| | | | | it provides the capability to make impstats emit deltas in contrast to accumulated counter values (see doc for details).
* impstats: reset stats counters no matter if CEE or regular mode is usedRainer Gerhards2013-09-091-3/+17
|
* experimental: make impstats return delta values where possibleRainer Gerhards2013-09-073-9/+17
|
* Merge branch 'v7-stable'Rainer Gerhards2013-09-051-1/+1
|\ | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * bugfix: some more build problems with newer json-c versionsRainer Gerhards2013-09-041-1/+1
| | | | | | | | Thanks to Michael Biebl for mentioning the problem.
* | Merge branch 'v7-stable'Rainer Gerhards2013-09-033-5/+6
|\|
| * make rsyslog use the new json-c pkgconfig file if availablehwoarang2013-09-033-5/+6
| |
* | Merge branch 'v7-stable'Rainer Gerhards2013-09-023-5/+12
|\|
| * Using more appropriate helper function to get the error messageAhto Truu2013-09-021-1/+1
| |
| * More careful TLV encoding/decodingAhto Truu2013-09-023-4/+11
| |
* | Merge branch 'c9'Rainer Gerhards2013-09-024-1/+23
|\ \ | | | | | | | | | | | | Conflicts: runtime/msg.c
| * | apply default TZ if none is present in legacy timestampRainer Gerhards2013-09-022-0/+10
| | |
| * | milestone: defaultTZ can be set in msg obj (via imtcp)Rainer Gerhards2013-08-302-1/+13
| |/ | | | | | | ... but parser does not yet use it.
* | add $!, $., $/ to RSYSLOG_DebugFormatRainer Gerhards2013-07-231-1/+1
| | | | | | | | Thanks to David Lang for the suggestion.
* | Merge branch 'master-globalvars'Rainer Gerhards2013-07-235-12/+64
|\ \
| * | 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-224-8/+42
| | |
* | | Added check if mainqueue cfg ptr is NULL in glblDestructMainqCnfObj function ↵Andre Lorbach2013-07-231-1/+4
|/ / | | | | | | (glbl.c)
* | 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
| | | |