summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* renamed conf.c to legacyconf.c to make room for new config systemRainer Gerhards2011-04-196-8/+8
|
* Merge branch 'v5-devel'Rainer Gerhards2011-04-153-5/+21
|\ | | | | | | | | Conflicts: plugins/impstats/impstats.c
| * bugfix: $myhostname not available in RainerScript (and no error message)Rainer Gerhards2011-04-143-5/+21
| | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=233
* | bugfix (kind of): memory leak with tcp reception epoll handlerRainer Gerhards2011-04-131-2/+12
| | | | | | | | | | This was an extremely unlikely leak and, if it happend, quite small. Still it is better to handle this border case.
* | added log classification capabilities (via mmnormalize & tags)Rainer Gerhards2011-04-131-16/+13
| |
* | Merge branch 'v5-devel'Rainer Gerhards2011-04-122-117/+119
|\| | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html plugins/imtcp/imtcp.c
| * cleanup: initially thought temporary debug message made durable ;)Rainer Gerhards2011-04-121-2/+2
| | | | | | | | | | It has proven to be very valuable, so now it is properly formatted inside the source.
| * bugfix: race condition in deferred name resolutionRainer Gerhards2011-04-081-115/+117
| | | | | | | | | | | | Note that this actually is a very small change, but I needed to shuffle a lot of code around in order to make it compile (due to required define order...).
* | Merge branch 'v5-devel'Rainer Gerhards2011-03-314-3/+17
|\| | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c
| * stop adding data to DA queue when low watermark has been reachedRainer Gerhards2011-03-301-0/+4
| | | | | | | | | | potentially closes: http://bugzilla.adiscon.com/show_bug.cgi?id=241 But needs more verification.
| * bugfix: PRI was invalid on Solaris for message from local log socketCorey Smith2011-03-241-3/+3
| | | | | | | | Signed-off-by: root <root@localhost.localdomain>
| * enhance: added $BOM system property to ease writing byte order masksRainer Gerhards2011-03-222-0/+11
| |
| * backporting patch for clean make distcheckRainer Gerhards2011-03-161-0/+3
| |
* | Merge branch 'v5-devel'Rainer Gerhards2011-03-142-5/+11
|\ \ | | | | | | | | | | | | Conflicts: tests/diag.sh
| * | fixing cosmetic memory leak in imdiag, imfileRainer Gerhards2011-03-141-0/+3
| |/ | | | | | | | | | | This had no real consequences, as it happend exactly once during the runtime, so the OS cleaned up. However, it broke the valgrind testbench.
| * Fall back to epoll_create() if epoll_create1() is not availableMichael Biebl2011-03-141-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
* | Merge branch 'v5-beta'Rainer Gerhards2011-03-1110-4/+85
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh
| * Merge branch 'v5-beta-gtls-fix' into v5-betaRainer Gerhards2011-03-0610-4/+85
| |\
| | * bugfix: regression: memory leak in module loaderBojan Smojver2011-03-042-13/+21
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * added work-around for bug in gtls, which causes fd leak when using TLSBojan Smojver2011-02-2310-4/+77
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge branch 'master-tcpsrv-mt'v6.1.5Rainer Gerhards2011-03-046-40/+41
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * \ \ Merge branch 'master' into master-tcpsrv-mtRainer Gerhards2011-02-2817-57/+232
| |\ \ \
| * | | | completed new TLS code in tcpfloodRainer Gerhards2011-02-281-0/+2
| | | | |
| * | | | (somewhat) improved TLS subsystemRainer Gerhards2011-02-011-22/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - improved TLS error reporting - improved TLS startup (Diffie-Hellman bits do not need to be generated, as we do not support full anon key exchange -- we always need certs)
| * | | | tcpsrv select-handler experimentally moved to multi-threading as wellRainer Gerhards2011-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | first tests done with plain tcp, TLS subsystems tests need to be carried out. No serious lab testing done so far.
| * | | | fixing regression: multi-threading had racesRainer Gerhards2011-01-314-1/+11
| | | | |
| * | | | interim commit: current debug state of new imptcpRainer Gerhards2011-01-281-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I need to verify the concept used in a simpler environment, and this means I probably need to freeze the (non-working) state here for a couple of days.
| * | | | resolved problem with intermixing requestsRainer Gerhards2011-01-271-2/+2
| | | | |
| * | | | experimental: added thread pool to tcpsrv epoll handlerRainer Gerhards2011-01-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | this seems to work in lab, but is brand-new code. needs practice drill.
* | | | | Merge branch 'v5-beta'Rainer Gerhards2011-03-011-1/+2
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | Conflicts: ChangeLog
| * | | bugfix: potential abort condition when $RepeatedMsgReduction set to onRainer Gerhards2011-03-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as well as potentially in a number of other places where MsgDup() was used. This only happened when the imudp input module was used and it depended on name resolution not yet had taken place. In other words, this was a strange problem that could lead to hard to diagnose instability. So if you experience instability, chances are good that this fix will help.
* | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-255-11/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | bugfix: fixed a memory leak and potential abort conditionRainer Gerhards2011-02-252-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | this could happen if multiple rulesets were used and some output batches contained messages belonging to more than one ruleset. fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=226 fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=218
| * | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2011-02-251-0/+5
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: ChangeLog
| | * | bugfix: memory leak when $RepeatedMsgReduction on was usedRainer Gerhards2011-02-251-0/+5
| | | | | | | | | | | | | | | | bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=225
| * | | added debug support for trying to find well-hidden bugRainer Gerhards2011-02-232-1/+12
| | | |
* | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-188-6/+54
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/glbl.c tools/omdiscard.c
| * | | bugfix: fixed compile problem due to empty structsDražen Kačar2011-02-164-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | this occured only on some platforms/compilers. thanks to Dražen Kačar for the fix Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| * | | improved error reporting for $WorkDirectoryRainer Gerhards2011-02-152-1/+37
| | | | | | | | | | | | | | | | | | | | non-existance and other detectable problems are now reported, and the work directory is NOT set in this case
| * | | bugfix: very long running actions could prevent shutdown under some ↵Rainer Gerhards2011-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | circumstances This has now been solved, at least for common situations.
| * | | removed no longer needed codeRainer Gerhards2011-02-112-3/+0
| | | |
| * | | bugfix: queue engine did not properly slow down inputs in FULL_DELAY mode...Rainer Gerhards2011-02-111-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | ...when in disk-assisted mode. This especially affected imfile, which created unnecessarily queue files if a large set of input file data was to process.
* | | | Merge branch 'v5-beta'Rainer Gerhards2011-02-112-5/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | bugfix: abort if imfile reads file line of more than 64KiBRainer Gerhards2011-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | Thanks to Peter Eisentraut for reporting and analysing this problem. bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=221
| * | | cosmetic: making comments in stream.c a bit more readableRainer Gerhards2011-02-101-4/+6
| | | |
* | | | Merge branch 'v5-devel'Rainer Gerhards2011-02-015-39/+137
|\| | | | |_|/ |/| | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/imudp/imudp.c plugins/ommysql/ommysql.c
| * | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-01-261-10/+11
| |\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-01-261-10/+11
| | |\
| | | * imfile bugfix: potential duplication of log contentRainer Gerhards2011-01-101-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | Under some circumstances an invalid truncation was detected. This code has now been removed, a file change (and thus resent) is only detected if the inode number changes.
| | | * forgot the actual patch with the last commit :(Rainer Gerhards2010-12-171-1/+1
| | | |