summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-11-243-1/+32
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| | | * | | | | Merge branch 'v3-stable' into v4-stableRainer Gerhards2010-11-243-1/+28
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| | | | * | | | bugfix(important): problem in TLS handling could cause rsyslog to loopv3.22.3Rainer Gerhards2010-11-243-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... in a tight loop, effectively disabling functionality and bearing the risk of unresponsiveness of the whole system. Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=194
| | * | | | | | bugfix: testbench failed if imptcp was not enabledRainer Gerhards2010-11-052-3/+8
| | | | | | | |
| | * | | | | | provide clear error message if platform does not support imptcpRainer Gerhards2010-11-051-0/+7
| | | | | | | |
| | * | | | | | permitted imptcp to work on systems which support epoll(), but not ↵Rainer Gerhards2010-11-052-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | epoll_create(). Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=204 Thanks to Nicholas Brink for reporting this problem.
| | * | | | | | bugfix: segfault when an *empty* template was usedRainer Gerhards2010-11-052-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=206 Thanks to David Hill for alerting us.
| | * | | | | | bugfix: compile failed with --enable-unlimited-selectvarmojfekoj2010-11-053-1/+5
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-203-3/+30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c
| * | | | | | Merge branch 'v4-devel' into v5-develroot2010-10-203-3/+30
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | imfile improvementsRainer Gerhards2010-10-243-18/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added the $InputFilePersistStateInterval config directive to imfile - changed imfile so that the state file is never deleted (makes imfile more robust in regard to fatal failures)
| | * | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-10-198-372/+84
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/cfsysline.c tools/ompipe.c
| | * | | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-10-221-2/+2
| | |\ \ \ \ \
* | | | | | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-2214-376/+126
|\| | | | | | |
| * | | | | | | Merge branch 'v5-stable' into v5-develRainer Gerhards2010-10-2214-376/+126
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | | | | fixing a potentially uninitialized variablev5.6.0Rainer Gerhards2010-10-191-1/+1
| | | | | | | |
| | * | | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-10-198-372/+84
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac runtime/cfsysline.c tools/ompipe.c
| | | * | | | | fixing some compile problems on FreeBSDRainer Gerhards2010-10-1910-376/+87
| | | | |/ / / | | | |/| | |
| | * | | | | fixed testbench compile problem on SolarisRainer Gerhards2010-10-191-1/+3
| | | | | | |
| | * | | | | yet another forgotten testbench fileRainer Gerhards2010-10-221-0/+12
| | | | | | |
| | * | | | | added forgotten testbench fileRainer Gerhards2010-10-221-0/+13
| | | | | | |
| | * | | | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2010-10-221-2/+2
| | |\| | | |
| | | * | | | better error messages in testbenchRainer Gerhards2010-10-221-2/+2
| | | | | | |
| | * | | | | preparing for 5.6.0Rainer Gerhards2010-10-223-2/+13
| | | | | | |
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-1510-19/+71
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | | | | Merge branch 'v5-beta' into v5-develRainer Gerhards2010-10-154-10/+32
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am plugins/imfile/imfile.c runtime/stream.c tests/tcpflood.c
| | * | | | | solved minor compile problem (caused by merge)Rainer Gerhards2010-10-151-1/+0
| | | | | | |
| | * | | | | Merge branch 'v4-devel' into v5-betaRainer Gerhards2010-10-1526-76/+1539
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile.am tests/tcpflood.c
| | | * | | | Merge branch 'v4-stable' into v4-develRainer Gerhards2010-10-154-10/+35
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/stream.c
| | | | * | | fixed incomplete mergeRainer Gerhards2010-10-151-0/+1
| | | | | | |
| | | | * | | imfile: bugfixes in regard to large files (> 2GB)Rainer Gerhards2010-10-153-10/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: a couple of problems that imfile had on some platforms, namely Ubuntu (not their fault, but occured there) - bugfix: imfile utilizes 32 bit to track offset. Most importantly, this problem can not experienced on Fedora 64 bit OS (which has 64 bit long's!)
| | | | * | | minor doc fix: updated tls doc to match new gnutls toolsetTom Bergfeld2010-09-081-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | | | | imfile: bug fixesRainer Gerhards2010-10-153-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | either one or two bugs fixed ;) Definitely a problem where no state file is written when working with relative pathes. Also, some problems with offsets should be fixed for very large files. However, I could not yet experimentally show the issue so it probably needs more verification.
| * | | | | | removed need for math libraryRainer Gerhards2010-10-114-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by doing math a little bit more optimal in hash table code. Also reduced memory requirement for imuxsock hash tables (expected number of connections was set too high -- table can be extended dynamically).
| * | | | | | Enable rsyslog.socket together with rsyslog.serviceMichael Biebl2010-10-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the rsyslog service is enabled via "systemctl enable rsyslog.service" also enable the socket unit.
| * | | | | | doc: documented way to turn off imuxsock ratelimitingRainer Gerhards2010-10-071-2/+3
| | | | | | |
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-062-3/+20
|\| | | | | |
| * | | | | | previous bugfix was incomplete, resolving thisRainer Gerhards2010-10-061-0/+4
| | | | | | |
| * | | | | | bugfix/imuxsock: did not compile on platforms without SCM_CREDENTIALSRainer Gerhards2010-10-062-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: we do rate-limiting by the pid and we obtain the pid via SCM_CREDENTIALS socket options. So this patch effectively disables the (new) ratelimiting capability. In a later patch, I'll see that I can provide a global ratelimiting capability, which could always be used (an alternative may be using the tag, will check this out as well).
* | | | | | | omhdfs: fixed some issues with new config interface functionsRainer Gerhards2010-10-052-42/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | also did some cleanup in omfile.c
* | | | | | | Merge branch 'v5-devel'Rainer Gerhards2010-10-0540-132/+3472
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c runtime/rsyslog.h
| * | | | | | preparing for 5.7.1v5.7.1Rainer Gerhards2010-10-053-5/+3
| | | | | | |
| * | | | | | Merge branch 'v5-devel-hdfs' into v5-develRainer Gerhards2010-10-0515-10/+636
| |\ \ \ \ \ \
| | * | | | | | omhdfs: added ability to create non-existing directories in name pathRainer Gerhards2010-10-041-56/+72
| | | | | | | |
| | * | | | | | omhdfs: fixed some issues with previous commitRainer Gerhards2010-10-041-12/+12
| | | | | | | |
| | * | | | | | omhdfs: support for HUP addedRainer Gerhards2010-10-046-13/+41
| | | | | | | |
| | * | | | | | omhdfs: added docRainer Gerhards2010-10-013-5/+28
| | | | | | | |
| | * | | | | | omhdfs: made action suspend/resume workingRainer Gerhards2010-10-011-10/+26
| | | | | | | |
| | * | | | | | omhdfs: more improvementsRainer Gerhards2010-10-016-22/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | finally this looks almost production ready for files where no directory path needs to be created
| | * | | | | | omhdfs: files now kept inside a hashtable for use by multiple actionsRainer Gerhards2010-10-013-12/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note:compiles, but not yet tested