Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into tmp | Rainer Gerhards | 2013-10-16 | 1 | -2/+14 |
|\ | |||||
| * | undo "localhostname property handling simplification", which broke things | Rainer Gerhards | 2013-10-16 | 1 | -2/+14 |
| | | | | | | | | | | | | in v7.5, this is not a simplification but actually complicates things. While we could fix the effects by patching other places, the end result would be anything else but simpler. So we undid that change. | ||||
* | | Merge branch 'master-var-refactor' into tmp | Rainer Gerhards | 2013-10-16 | 1 | -203/+146 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'master' into master-var-refactor | Rainer Gerhards | 2013-10-26 | 1 | -0/+8 |
| |\ | |||||
| * | | refactoring regression fix: segfault if $$now is used in script | Rainer Gerhards | 2013-10-24 | 1 | -0/+6 |
| | | | | | | | | | | | | Thanks to Pavel Levshin for finding this bug. | ||||
| * | | Merge branch 'master' into master-var-refactor | Rainer Gerhards | 2013-10-24 | 1 | -0/+6 |
| |\ \ | |||||
| * | | | (temporarily?) re-enable global vars in string templates | Rainer Gerhards | 2013-10-23 | 1 | -0/+2 |
| | | | | |||||
| * | | | refactoring regression fix: invalid free for JSON properties | Rainer Gerhards | 2013-10-23 | 1 | -1/+4 |
| | | | | |||||
| * | | | permit writing not only msg variables via the msgAddJSON() API | Rainer Gerhards | 2013-10-23 | 1 | -18/+17 |
| | | | | |||||
| * | | | bugfix: unset statement always worked on message var, even if local var was ↵ | Rainer Gerhards | 2013-10-23 | 1 | -9/+21 |
| | | | | | | | | | | | | | | | | given | ||||
| * | | | fix VAR handling in script grammar and code | Rainer Gerhards | 2013-10-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | The $-var designator is now correctly stripped off the varname. | ||||
| * | | | enable error message for invalid property names | Rainer Gerhards | 2013-10-23 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | also add some support for global vars back, as the syntax may not go away. | ||||
| * | | | refactor: align jsonFind() calling interface with recent changes | Rainer Gerhards | 2013-10-23 | 1 | -4/+4 |
| | | | | |||||
| * | | | refactor: remove now no-longer needed functions | Rainer Gerhards | 2013-10-23 | 1 | -72/+0 |
| | | | | |||||
| * | | | refactor get.*PropVal() series of functions | Rainer Gerhards | 2013-10-23 | 1 | -30/+24 |
| | | | | |||||
| * | | | remove no longer necessary cases | Rainer Gerhards | 2013-10-23 | 1 | -6/+2 |
| | | | | |||||
| * | | | fix potential segfault introduced by last refactoring | Rainer Gerhards | 2013-10-23 | 1 | -2/+5 |
| | | | | |||||
| * | | | refactor: simplify JSON variable access | Rainer Gerhards | 2013-10-23 | 1 | -28/+17 |
| | | | | |||||
| * | | | refactor: use common code for message property description processing | Rainer Gerhards | 2013-10-22 | 1 | -15/+51 |
| | | | | | | | | | | | | | | | | in all cases except script var access -- this comes next... | ||||
| * | | | refactor: somewhat simplify property-name-to-id mapping | Rainer Gerhards | 2013-10-21 | 1 | -20/+3 |
| | | | | |||||
| * | | | work a bit toward string handling unification | Rainer Gerhards | 2013-10-21 | 1 | -43/+36 |
| | | | | |||||
| * | | | prep work to support one-char variable namepaces | Rainer Gerhards | 2013-10-21 | 1 | -6/+6 |
| | | | | |||||
* | | | | refactor: simplify localHostName property handling | Rainer Gerhards | 2013-10-28 | 1 | -15/+2 |
| |_|/ |/| | | |||||
* | | | Make use of int64 json numbers, if available | Pavel Levshin | 2013-10-26 | 1 | -0/+8 |
| |/ |/| | |||||
* | | bugfix: Segmentation fault on incorrect variable assignment | Pavel Levshin | 2013-10-24 | 1 | -0/+6 |
|/ | |||||
* | regression fix: global variable access did not work | Rainer Gerhards | 2013-10-21 | 1 | -2/+2 |
| | |||||
* | Merge branch 'v7-stable-mmrfc5424addhmac' | Rainer Gerhards | 2013-09-26 | 1 | -2/+6 |
|\ | |||||
| * | mmrfc5424addhmac: correctly handle empty structured data | Rainer Gerhards | 2013-09-26 | 1 | -2/+6 |
| | | |||||
* | | Merge branch 'v7-stable-mmrfc5424addhmac' | Rainer Gerhards | 2013-09-26 | 1 | -46/+46 |
|\| | | | | | | | | | | | | | | | Conflicts: Makefile.am configure.ac runtime/msg.c runtime/rsyslog.h | ||||
| * | mmrfc5424addhmac: complete initial implementation | Rainer Gerhards | 2013-09-25 | 1 | -0/+16 |
| | | | | | | | | | | hash is now also persisted back to structured-data rsyslog property | ||||
| * | simplify STRUCTURED-DATA representation in msg object | Rainer Gerhards | 2013-09-25 | 1 | -17/+19 |
| | | |||||
| * | expose so-far msg-internal method to query structured data | Rainer Gerhards | 2013-09-23 | 1 | -22/+11 |
| | | | | | | | | | | | | | | | | 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 | 1 | -10/+3 |
| | | |||||
* | | regression fix: message properties did not work | Rainer Gerhards | 2013-09-11 | 1 | -1/+1 |
| | | | | | | | | | | This was a regeression from the global/local variabe work done for this release. Consequently, this problem did not occur in any released version. | ||||
* | | 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 | 1 | -1/+1 |
|\| | |||||
| * | make rsyslog use the new json-c pkgconfig file if available | hwoarang | 2013-09-03 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'c9' | Rainer Gerhards | 2013-09-02 | 1 | -0/+10 |
|\ \ | | | | | | | | | | | | | Conflicts: runtime/msg.c | ||||
| * | | milestone: defaultTZ can be set in msg obj (via imtcp) | Rainer Gerhards | 2013-08-30 | 1 | -0/+10 |
| |/ | | | | | | | ... but parser does not yet use it. | ||||
* | | 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 | 1 | -2/+6 |
| | | | | | | | | | | 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 | 1 | -8/+34 |
| | | |||||
* | | Merge branch 'master-localvars' | Rainer Gerhards | 2013-07-20 | 1 | -49/+130 |
|\ \ | |/ |/| | |||||
| * | 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 | 1 | -10/+57 |
| | | | | | | | | but some nits, like do not work with disk queues | ||||
| * | refactor in preparation of local variables | Rainer Gerhards | 2013-07-17 | 1 | -39/+65 |
| | | | | | | | | | | local variables require a second json root; this refactoring makes sure we can basically use common functions for json handling | ||||
* | | 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 | ||||
* | | bugfix: memory leak if disk queues were used and json data present | Rainer Gerhards | 2013-07-17 | 1 | -0/+1 |
| | | |||||
* | | bugfix: CEE/json data was lost during disk queue operation | Rainer Gerhards | 2013-07-17 | 1 | -2/+1 |
|/ |