Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v7-stable-mmrfc5424addhmac' | Rainer Gerhards | 2013-09-26 | 3 | -47/+68 |
|\ | | | | | | | | | | | | | | | Conflicts: Makefile.am configure.ac runtime/msg.c runtime/rsyslog.h | ||||
| * | mmrfc5424addhmac: complete initial implementation | Rainer Gerhards | 2013-09-25 | 2 | -0/+17 |
| | | | | | | | | | | hash is now also persisted back to structured-data rsyslog property | ||||
| * | simplify STRUCTURED-DATA representation in msg object | Rainer Gerhards | 2013-09-25 | 2 | -19/+23 |
| | | |||||
| * | milestone: mmpstrucdata parses STRUCTURED-DATA (but does not yet store it) | Rainer Gerhards | 2013-09-23 | 2 | -0/+7 |
| | | |||||
| * | expose so-far msg-internal method to query structured data | Rainer Gerhards | 2013-09-23 | 2 | -22/+12 |
| | | | | | | | | | | | | | | | | This also lead to a slight performance optimization in the msg.c module (when it comes to querying structured data). This is stage work in order to provide the capability to fully parse structured data. | ||||
| * | mmrfc5424addhmac milestone: do not process non-rfc5424 messages | Rainer Gerhards | 2013-09-23 | 2 | -10/+12 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-26 | 1 | -1/+0 |
|\ \ | |||||
| * | | remove no-longer needed data item | Rainer Gerhards | 2013-09-25 | 1 | -1/+0 |
| |/ | |||||
* | | imtcp: add streamdriver.name module parameter | Rainer Gerhards | 2013-09-17 | 4 | -3/+54 |
| | | | | | | | | permits overriding the system default stream driver (gtls, ptcp) | ||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-13 | 2 | -3/+21 |
|\| | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| * | bugfix: segfault on startup if TCP TLS was used but no cert or key set | Rainer Gerhards | 2013-09-13 | 2 | -1/+13 |
| | | |||||
| * | Merge branch 'v7-stable' into v7-stable-tlsfix | Rainer Gerhards | 2013-09-13 | 61 | -869/+5925 |
| |\ | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h | ||||
| | * | bugfix: build system: libgcrypt.h needed even if libgrcypt was disabled | Rainer Gerhards | 2013-09-12 | 2 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Jonny Törnbom for reporting this problem Conflicts: ChangeLog runtime/cryprov.h | ||||
| * | | bugfix: segfault on startup if TLS was used but no CA cert set | Rainer Gerhards | 2013-09-13 | 2 | -2/+8 |
| | | | |||||
* | | | bugfix: build system: libgcrypt.h needed even if libgrcypt was disabled | Rainer Gerhards | 2013-09-12 | 2 | -3/+1 |
| | | | | | | | | | | | | Thanks to Jonny Törnbom for reporting this problem | ||||
* | | | regression fix: message properties did not work | Rainer Gerhards | 2013-09-11 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | This was a regeression from the global/local variabe work done for this release. Consequently, this problem did not occur in any released version. | ||||
* | | | imfile: support LF escaping in read mode 2 | Rainer Gerhards | 2013-09-10 | 1 | -6/+16 |
| | | | |||||
* | | | imfile: support LF escaping in read mode 1 | Rainer Gerhards | 2013-09-10 | 2 | -6/+16 |
| | | | |||||
* | | | impstats: implement parameter "resetCounters" | Rainer Gerhards | 2013-09-09 | 2 | -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 used | Rainer Gerhards | 2013-09-09 | 1 | -3/+17 |
| | | | |||||
* | | | experimental: make impstats return delta values where possible | Rainer Gerhards | 2013-09-07 | 3 | -9/+17 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-05 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | bugfix: some more build problems with newer json-c versions | Rainer Gerhards | 2013-09-04 | 1 | -1/+1 |
| | | | | | | | | | | | | Thanks to Michael Biebl for mentioning the problem. | ||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-03 | 3 | -5/+6 |
|\| | | |||||
| * | | make rsyslog use the new json-c pkgconfig file if available | hwoarang | 2013-09-03 | 3 | -5/+6 |
| | | | |||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-09-02 | 3 | -5/+12 |
|\| | | |||||
| * | | Using more appropriate helper function to get the error message | Ahto Truu | 2013-09-02 | 1 | -1/+1 |
| | | | |||||
| * | | More careful TLV encoding/decoding | Ahto Truu | 2013-09-02 | 3 | -4/+11 |
| | | | |||||
* | | | Merge branch 'c9' | Rainer Gerhards | 2013-09-02 | 4 | -1/+23 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c | ||||
| * | | | apply default TZ if none is present in legacy timestamp | Rainer Gerhards | 2013-09-02 | 2 | -0/+10 |
| | | | | |||||
| * | | | milestone: defaultTZ can be set in msg obj (via imtcp) | Rainer Gerhards | 2013-08-30 | 2 | -1/+13 |
| |/ / | | | | | | | | | | ... but parser does not yet use it. | ||||
* | | | add $!, $., $/ to RSYSLOG_DebugFormat | Rainer Gerhards | 2013-07-23 | 1 | -1/+1 |
| | | | | | | | | | | | | Thanks to David Lang for the suggestion. | ||||
* | | | Merge branch 'master-globalvars' | Rainer Gerhards | 2013-07-23 | 5 | -12/+64 |
|\ \ \ | |||||
| * | | | add proper sync to global variables | Rainer Gerhards | 2013-07-23 | 1 | -3/+17 |
| | | | | |||||
| * | | | fix: global&local variables could not be accessed via RainerScript | Rainer Gerhards | 2013-07-23 | 2 | -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 Gerhards | 2013-07-22 | 4 | -8/+42 |
| | | | | |||||
* | | | | Added check if mainqueue cfg ptr is NULL in glblDestructMainqCnfObj function ↵ | Andre Lorbach | 2013-07-23 | 1 | -1/+4 |
|/ / / | | | | | | | | | | (glbl.c) | ||||
* | | | Merge branch 'master-localvars' | Rainer Gerhards | 2013-07-20 | 4 | -53/+143 |
|\ \ \ | |||||
| * | | | make local vars work together with disk queues | Rainer Gerhards | 2013-07-17 | 1 | -0/+8 |
| | | | | |||||
| * | | | milestone: basic local variable functionality available | Rainer Gerhards | 2013-07-17 | 4 | -13/+69 |
| | | | | | | | | | | | | | | | | but some nits, like do not work with disk queues | ||||
| * | | | refactor in preparation of local variables | Rainer Gerhards | 2013-07-17 | 2 | -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 Gerhards | 2013-07-19 | 1 | -4/+4 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | debug: improve queue startup debug output | Rainer Gerhards | 2013-07-19 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-07-19 | 2 | -3/+2 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: runtime/stream.c | ||||
| * | | | Merge branch 'v6-stable' into tmp | Rainer Gerhards | 2013-07-19 | 2 | -3/+2 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'v5-stable' into tmp | Rainer Gerhards | 2013-07-19 | 2 | -3/+2 |
| | |\ \ \ | |||||
| | | * | | | 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. | ||||
* | | | | | | main_queue() config object added | Rainer Gerhards | 2013-07-19 | 3 | -4/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | doc still missing | ||||
* | | | | | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-07-19 | 1 | -2/+2 |
|\| | | | | | |||||
| * | | | | | bugfix: $QHOUR/$HHOUR were always "00" or "01" | Rainer Gerhards | 2013-07-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | regression some time between v5 and here Thanks to forum user rjmcinty for reporting this bug |