Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|/ | |||||
* | build: fix issues on FreeBSD | Rainer Gerhards | 2013-06-25 | 1 | -1/+1 |
| | | | | | The last fix was incomplete. Thanks to Christiano for testing and suggestions. | ||||
* | $uptime property: fix mem leak and build problems on FreeBSD | Rainer Gerhards | 2013-06-24 | 1 | -3/+27 |
| | |||||
* | cleanup | Rainer Gerhards | 2013-03-29 | 1 | -2/+0 |
| | |||||
* | Merge branch 'v7-stable-info' | Rainer Gerhards | 2013-03-29 | 1 | -5/+12 |
|\ | | | | | | | | | | | Conflicts: ChangeLog template.c | ||||
| * | permit substring extraction relative to end-of-string in templates | Rainer Gerhards | 2013-03-29 | 1 | -5/+12 |
| | | |||||
* | | mmanon: complete ipv4 functionality | Rainer Gerhards | 2013-03-04 | 1 | -0/+8 |
| | | |||||
* | | optimze: reduce memory operations during dns resolution/hostname setting | Rainer Gerhards | 2013-01-22 | 1 | -20/+38 |
| | | | | | | | | | | | | | | | | | | | | previously, hostname and ip strings were shuffled to the msg object, which created a property out of them. Now the cache holds the property, and it is resused (almost) everywhere, what saves a lot of memory operations. The only exception is imtcp session setup, where different handling of the hostname is done, which we need to sort out (but that's another story). | ||||
* | | Merge branch 'master' into master-dns-props | Rainer Gerhards | 2013-01-24 | 1 | -6/+10 |
|\ \ | |||||
| * | | regression fix: programname was not properly handled | Rainer Gerhards | 2013-01-24 | 1 | -6/+10 |
| | | | | | | | | | | | | Regression from recent refactoring - never released. | ||||
* | | | optimize: have dns cache pre-create rsyslog prop_t's | Rainer Gerhards | 2013-01-24 | 1 | -7/+3 |
|/ / | |||||
* | | optimize: reduce nbr of strcpy() in FROMHOST processing | Rainer Gerhards | 2013-01-18 | 1 | -3/+5 |
| | | |||||
* | | bugfix: regression from textpri() optimization | Rainer Gerhards | 2013-01-15 | 1 | -1/+2 |
| | | |||||
* | | optimize: obtaining programname | Rainer Gerhards | 2013-01-14 | 1 | -62/+29 |
| | | | | | | | | included some additional refactoring for cleaner code | ||||
* | | optimzize: msg/getNow() - remove snprintf | Rainer Gerhards | 2013-01-14 | 1 | -8/+26 |
| | | | | | | | | instead, we use a lookup table for the values. | ||||
* | | optimize msg.c/textpri | Rainer Gerhards | 2013-01-14 | 1 | -10/+14 |
| | | | | | | | | remove snprintf() in favor for quicker code | ||||
* | | optimize: do date() call in template processing only if actually needed | Rainer Gerhards | 2013-01-13 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-01-09 | 1 | -1/+6 |
|\| | | | | | | | | | Conflicts: ChangeLog | ||||
| * | Check that sysinfo(2) can return uptime | Martin Carpenter | 2013-01-09 | 1 | -1/+6 |
| | | |||||
* | | Merge branch 'v7-stable' | Rainer Gerhards | 2013-01-08 | 1 | -0/+2 |
|\| | |||||
| * | bugfix: very large memory consumption (and probably out of memory) | Rainer Gerhards | 2013-01-07 | 1 | -0/+2 |
| | | | | | | | | | | ...when FromPos was specified in template, but ToPos not. Thanks to Radu Gheorghe for alerting us of this bug. | ||||
* | | minor cleanup | Rainer Gerhards | 2012-12-14 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'v7-stable-newmsglock' into master-newmsglock | Rainer Gerhards | 2012-12-06 | 1 | -132/+89 |
|\| | | | | | | | | | | | | | Conflicts: runtime/msg.c runtime/queue.c tools/syslogd.c | ||||
| * | Merge branch 'v6-stable-newmsglock' into v7-stable-newmsglock | Rainer Gerhards | 2012-12-06 | 1 | -137/+9 |
| |\ | | | | | | | | | | | | | Conflicts: tools/syslogd.c | ||||
| | * | bugfix: some message properties could be garbled due to race condition | Rainer Gerhards | 2012-12-06 | 1 | -137/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happened only on very high volume systems, if the same message was being processed by two different actions. This was a regression caused by the new config processor, which did no longer properly enable msg locking in multithreaded cases. The bugfix is actually a refactoring of the msg locking code - we no longer do unlocked operations, as the use case for it has mostly gone away. It is potentially possible only at very low-end systems, and there the small additional overhead of doing the locking does not really hurt. Instead, the removal of that capability can actually slightly improve performance in common cases, as the code path is smaller and requires slightly less memory writes. That probably outperforms the extra locking overhead (which in the low-end case always happens in user space, without need for kernel support as we can always directly aquire the lock - there is no contention at all). | ||||
* | | | Merge branch 'v7-stable' | Rainer Gerhards | 2012-11-14 | 1 | -2/+2 |
|\| | | |||||
| * | | bugfix: make rsyslog compile on kfreebsd again | Guillem Jover | 2012-11-14 | 1 | -2/+2 |
| | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=380 |