Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v5-stable-newstats' into v5-beta | Rainer Gerhards | 2012-04-19 | 1 | -2/+2 |
|\ | | | | | | | | | | | Conflicts: ChangeLog configure.ac | ||||
| * | bugfix: imptcp input name could not be set | Rainer Gerhards | 2012-04-19 | 1 | -2/+2 |
| | | | | | | | | config directive was accepted, but had no effect | ||||
* | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-20 | 1 | -2/+13 |
|\| | | | | | | | | | | | Conflicts: ChangeLog plugins/imptcp/imptcp.c | ||||
| * | added configuration directive to disable octet-counted framing | Rainer Gerhards | 2012-03-20 | 1 | -3/+14 |
| | | | | | | | | for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming | ||||
* | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-14 | 1 | -0/+1 |
|\| | | | | | | | | | Conflicts: configure.ac | ||||
| * | added missing initialization of stats counters | Rainer Gerhards | 2012-03-14 | 1 | -0/+1 |
| | | | | | | | | | | | | | | this was necessary due to refactoring of the stats subsystem ... but should have been done in the first place when this code was written. Thanks to Kaiwang Chen for his analysis of the stats subsystem, which ultimately lead to this patch! | ||||
* | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-03-12 | 1 | -1/+3 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/imuxsock.html doc/manual.html runtime/queue.c | ||||
| * | bugfix: imptcp stats sometimes incorrectly reported socket as IPv6 | Rainer Gerhards | 2012-02-20 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'v5-stable-newstats' into v5-devel | Rainer Gerhards | 2012-01-18 | 1 | -15/+41 |
|\| | |||||
| * | imptcp: added additional information to stats record | Rainer Gerhards | 2012-01-18 | 1 | -6/+10 |
| | | |||||
| * | imptcp: added basic stats counters | Rainer Gerhards | 2012-01-18 | 1 | -10/+32 |
| | | |||||
* | | Merge branch 'v5-stable-elasticsearch' into v5-devel-tmp | Rainer Gerhards | 2012-01-17 | 1 | -17/+16 |
|\| | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html tools/syslogd.c | ||||
| * | licensing update | Rainer Gerhards | 2012-01-16 | 1 | -17/+16 |
| | | |||||
* | | added support to control KEEPALIVE settings in imptcp | Rainer Gerhards | 2011-05-13 | 1 | -2/+66 |
| | | | | | | | | this has not yet been added to imtcp, but could be done on request | ||||
* | | imptcp: added capability to activate keep-alive at socket layer | Rainer Gerhards | 2011-05-11 | 1 | -4/+37 |
|/ | |||||
* | fixed compile problem from epoll_create patch | Rainer Gerhards | 2011-03-14 | 1 | -1/+1 |
| | |||||
* | Fall back to epoll_create() if epoll_create1() is not available | Michael Biebl | 2011-03-14 | 1 | -5/+8 |
| | | | | | | | | | epoll_create1() was introduced in Linux kernel 2.6.27. If rsyslog was compiled on a newer kernel but run on a kernel older than 2.6.27, remote syslog fails. Apply a runtime check for epoll_create1() and fall back to epoll_create() in this case. Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617996 | ||||
* | added work-around for bug in gtls, which causes fd leak when using TLS | Bojan Smojver | 2011-02-23 | 1 | -0/+1 |
| | | | | | | | | The capability has been added for module to specify that they do not like being unloaded. related bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=222 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | streamlined epoll_create() code a little bit | Rainer Gerhards | 2010-11-25 | 1 | -2/+5 |
| | |||||
* | fixed compile problem in imptcp if no epoll_create1() is present | David Hill | 2010-11-25 | 1 | -0/+1 |
| | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | provide clear error message if platform does not support imptcp | Rainer Gerhards | 2010-11-05 | 1 | -0/+7 |
| | |||||
* | permitted imptcp to work on systems which support epoll(), but not ↵ | Rainer Gerhards | 2010-11-05 | 1 | -1/+8 |
| | | | | | | | epoll_create(). Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=204 Thanks to Nicholas Brink for reporting this problem. | ||||
* | solved minor compile problem (caused by merge) | Rainer Gerhards | 2010-10-15 | 1 | -1/+0 |
| | |||||
* | imptcp: added $InputPTCPServerAddtlFrameDelimiter directive | Rainer Gerhards | 2010-08-11 | 1 | -5/+8 |
| | | | | also improved testbench | ||||
* | fixed minor issue: imptcp did a close(-1) on each accept | Rainer Gerhards | 2010-08-11 | 1 | -1/+2 |
| | |||||
* | imptcp: added $InputPTCPServerNotifyOnConnectionClose directive | Rainer Gerhards | 2010-08-11 | 1 | -5/+8 |
| | | | | plus some minor cleanup | ||||
* | some cleanup and minor optimization | Rainer Gerhards | 2010-08-10 | 1 | -33/+32 |
| | |||||
* | added tests for imptcp and fixed some problems with it | Rainer Gerhards | 2010-08-10 | 1 | -18/+41 |
| | | | | it now also works reliably in edge-triggered mode | ||||
* | added imptcp | Rainer Gerhards | 2010-08-10 | 2 | -0/+1152 |
imptcp is a simplified, Linux-specific and potentielly fast syslog plain tcp input plugin (NOT supporting TLS!) |