Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2011-12-19 | 1 | -1/+15 |
|\ | | | | | | | | | | | Conflicts: ChangeLog action.c | ||||
| * | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-16 | 1 | -1/+4 |
| |\ | |||||
| | * | bugfix: potential fatal abort in omgssapi | Tomas Heinrich | 2011-12-16 | 1 | -1/+3 |
| | | | |||||
| | * | added doc for omprog | Rainer Gerhards | 2011-12-16 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-12-01 | 1 | -0/+3 |
| |\| | | | | | | | | | | | | | Conflicts: action.c | ||||
| | * | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2011-12-01 | 1 | -0/+3 |
| | |\ | |||||
| | | * | bugfix: action resume interval incorrectly handled, thus took longer to resume | Tomas Heinrich | 2011-12-01 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | | * | bugfix: cosmetic: proper constant used instead of number in open call | Tomas Heinrich | 2011-12-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-27 | 1 | -1/+9 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | bugfix: potential abort after reading invalid X.509 certificate | Tomas Heinrich | 2011-10-27 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | more work on queue statistics counter | Rainer Gerhards | 2011-12-16 | 1 | -2/+2 |
| | | | | |||||
* | | | | new stats counter "discarded" for queue object | Rainer Gerhards | 2011-12-16 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | Tells how many messages have been discarded due to queue full condition. | ||||
* | | | | enhanced module loader to not rely on PATH_MAX | Rainer Gerhards | 2011-12-16 | 1 | -0/+3 |
| | | | | |||||
* | | | | preparing for 5.9.4v5.9.4 | Rainer Gerhards | 2011-11-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | imuxsock: added capability to "annotate" messages with "trusted information", | Rainer Gerhards | 2011-11-29 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | which contains some properties obtained from the system and as such sure to not be faked. This is inspired by the similiar idea introduced in systemd. | ||||
* | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-10-21 | 1 | -1/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * | | | preparing for 5.8.6 releasev5.8.6 | Rainer Gerhards | 2011-10-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | bugfix: missing whitespace after property-based filter was not detected | Rainer Gerhards | 2011-10-21 | 1 | -0/+1 |
| | | | | |||||
| * | | | bugfix: $OMFileFlushInterval period was doubled - now using correct value | Rainer Gerhards | 2011-10-18 | 1 | -0/+1 |
| | | | | |||||
* | | | | removed dependency on gcrypt for recently-enough GnuTLS | Rainer Gerhards | 2011-10-17 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | see: http://bugzilla.adiscon.com/show_bug.cgi?id=289 | ||||
* | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-10-17 | 1 | -1/+15 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | Merge branch 'v5-stable' of git+ssh://git.adiscon.com/git/rsyslog into v5-stable | Rainer Gerhards | 2011-10-17 | 1 | -1/+9 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | | | doc: mention imported bugfix in ChangeLog | Rainer Gerhards | 2011-10-13 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-10-13 | 1 | -0/+2 |
| | |\| | | |||||
| | | * | | bugfix: $ActionExecOnlyOnce interval did not work properly | Tomas Heinrich | 2011-10-13 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| | * | | | bugfix: race condition when extracting structured data and PROCID | Rainer Gerhards | 2011-10-13 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | same issue as previous commit for PROGNAME and APPNAME | ||||
| | * | | | bugfix: race condition when extracting program name and APPNAME | Rainer Gerhards | 2011-10-13 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | could lead to invalid characters e.g. in dynamic file names | ||||
| * | | | | bugfix: ActionQueue could malfunction due to index error | Vlad Grigorescu | 2011-10-17 | 1 | -0/+2 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
| * | | | bugfix: imfile did invalid system call under some circumstances | Rainer Gerhards | 2011-10-07 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | when a file that was to be monitored did not exist BUT the state file actually existed. Mostly a cosmetic issue. Root cause was incomplete error checking in stream.c; so patch may affect other code areas. | ||||
* | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-09-26 | 1 | -11/+39 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h tools/omfile.c tools/ompipe.c | ||||
| * | | | bugfix: omfile returns fatal error code for things that go really wrong | Rainer Gerhards | 2011-09-26 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | previously, RS_RET_RESUME was returned, which lead to a loop inside the rule engine as omfile could not really recover. | ||||
| * | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-09-22 | 1 | -0/+28 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: this merge has problems, to be fixed with follow-up commits If file creation fails due to out of memory, we can enter a tight loop. Conflicts: ChangeLog configure.ac doc/manual.html runtime/parser.c runtime/rsyslog.h tests/Makefile.am tests/tcpflood.c | ||||
| | * | | bugfix: potential abort if ultra-large file io buffers are used and | Rainer Gerhards | 2011-09-20 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | dynafile cache exhausts address space (primarily a problem on 32 bit platforms) | ||||
| | * | | Merge branch 'v4-beta' into v4-stable, prep for 4.8.0v4.8.0 | Rainer Gerhards | 2011-09-07 | 1 | -0/+98 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no changes compared to 4.7.5, just a re-release with the new version number as new v4-stable. The most important new feature is Solaris support. Conflicts: configure.ac doc/manual.html | ||||
| | | * | | preparing for 4.7.5 releasev4.7.5 | Rainer Gerhards | 2011-08-31 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-09-07 | 1 | -1/+7 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c | ||||
| * | | | | bugfix: imuxsock did no longer ignore message-provided timestamp, | Rainer Gerhards | 2011-09-07 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | if so configured (the *default*). Lead to no longer sub-second timestamps. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=281 | ||||
| * | | | | bugfix: rsyslogd -v always said 64 atomics were not present | mono_matsuko | 2011-09-05 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | | cosmetic: adding imported bugfix to ChangeLog | Rainer Gerhards | 2011-08-31 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-08-31 | 1 | -0/+1 |
|\| | | | | |||||
| * | | | | bugfix: mark message processing did not work correctly | Rainer Gerhards | 2011-08-31 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v4-beta' into v5-devel | Rainer Gerhards | 2011-08-30 | 1 | -0/+12 |
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * | | | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2011-08-30 | 1 | -3/+5 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | Added changelog entry | Andre Lorbach | 2011-08-11 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'v4-stable' into v4-beta | Andre Lorbach | 2011-08-11 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2011-08-09 | 1 | -0/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'v4-stable' into v4-beta | Andre Lorbach | 2011-08-05 | 1 | -0/+7 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * | | | | | | | preparing for 4.7.4v4.7.4 | Rainer Gerhards | 2011-07-11 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'v4-stable' into v4-devel | Rainer Gerhards | 2011-07-11 | 1 | -3/+15 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
* | \ \ \ \ \ \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-08-30 | 1 | -4/+8 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog |