summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cleanup (removed left-over from backport)v4.3.2Rainer Gerhards2009-06-241-2/+0
|
* Merge branch 'v4-stable' into betaRainer Gerhards2009-06-241-2/+2
|\
| * Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-06-241-2/+2
| |\
| | * minor doc bugfix: name of rsyslogd.pid corrected (was syslogd.pid)Michael Biebl2009-06-241-2/+2
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Merge branch 'v4-stable' into betaRainer Gerhards2009-06-243-3/+4
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | finishing touches for 4.2.0v4.2.0Rainer Gerhards2009-06-221-0/+1
| | |
| * | preparing for v4-stableRainer Gerhards2009-06-223-3/+3
| | |
* | | minor: prepped ChangeLog for next betaRainer Gerhards2009-06-241-1/+1
| | |
* | | Merge branch 'beta'Rainer Gerhards2009-06-184-8/+25
|\| |
| * | Merge branch 'v3-stable' into betaRainer Gerhards2009-06-184-10/+27
| |\|
| | * some minor bugfixesRainer Gerhards2009-06-185-11/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: invalid error message issued if $inlcudeConfig was on an empty set of files (e.g. *.conf, where none such files existed) thanks to Michael Biebl for reporting this bug - bugfix: when run in foreground (but not in debug mode), a debug message ("DoDie called") was emitted at shutdown. Removed. thanks to Michael Biebl for reporting this bug - bugfix: some garbagge was emitted to stderr on shutdown. This garbage consisted of file names, which were written during startup (key point: not a pointer error) thanks to Michael Biebl for reporting this bug - bugfix: startup and shutdown message were emitted to stdout thanks to Michael Biebl for reporting this bug
| | * removed forgotten debug messageRainer Gerhards2009-06-151-1/+0
| | |
| | * bugfix: error messages were not emitted to stderr in forked modeRainer Gerhards2009-06-152-2/+7
| | | | | | | | | | | | stderr and stdo are now kept open across fork()
* | | removed long-obsoleted property UxTradMsgRainer Gerhards2009-06-168-77/+65
| | | | | | | | | | | | | | | ... as well as some cleanup (some commented-out code is left to support UxTradMsg again is someone really complains ;)).
* | | done various optimizations to the stringbuf and its usersRainer Gerhards2009-06-1618-360/+282
| | |
* | | some performance optimizationsRainer Gerhards2009-06-1614-104/+102
| | | | | | | | | | | | | | | | | | - saved gettimeofday() calls in imtcp (and increased reception buffer) - somewhat optimized stringbuf.c - some other optimizations
* | | backported macros necessary to create output modules with transaction supportRainer Gerhards2009-06-041-1/+71
| | | | | | | | | | | | | | | | | | this does not mean the v4 engine will support batches and output transactions, but I can now write plugins that will work equally well with v4 AND v5. I consider this useful during the rewrite of omfile.
* | | backported some of the v5 testbenchRainer Gerhards2009-06-0410-41/+123
| | | | | | | | | | | | | | | | | | | | | | | | this permits us to keep a persistent test environment between v4 and v5, most importantly using the same tools. As far as the actual tests are concerned, some had issues. I had no time to check if that was an issue with the test or an actual issue with the v3/4 engine. Will do that at some later stage.
* | | added config switch --enable-testbench=no to turn off testbenchRainer Gerhards2009-06-033-0/+19
| | |
* | | strmsrv now supports KEEPALIVE socket optionRainer Gerhards2009-06-027-4/+82
| | |
* | | slightly extended strms_sess interfaceRainer Gerhards2009-06-022-1/+10
| | |
* | | added a generic network stream serverRainer Gerhards2009-06-028-1/+1444
| | | | | | | | | | | | (in addition to rather specific syslog tcp server)
* | | added support for custom modulesRainer Gerhards2009-06-023-0/+26
| | | | | | | | | | | | | | | | | | ... this provides some basic support to integrate extensions that are not direct parts of rsyslog to be built during its build process.
* | | Merge branch 'udpdrop'Rainer Gerhards2009-05-293-20/+58
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: runtime/conf.c
| * | | added ability for the UDP output action to rebind its send socket after ↵Rainer Gerhards2009-05-294-21/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sending n messages New config directive $ActionSendUDPRebindInterval added for the purpose. By default, rebinding is disabled. This is considered useful for load balancers.
* | | | Merge branch 'beta'Rainer Gerhards2009-05-293-2/+3
|\ \ \ \ | |/ / / |/| / / | |/ / | | | Conflicts: runtime/rsyslog.h
| * | Merge branch 'v3-stable' into betaRainer Gerhards2009-05-293-2/+3
| |\| | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| | * fixed a regression of yesterday's patchRainer Gerhards2009-05-293-2/+3
| | | | | | | | | | | | | | | ... I know I should not have done this to a stable branch... Thankfully nothing was yet released.
* | | fix: import from beta accidently disable imdiagRainer Gerhards2009-05-291-3/+0
| | |
* | | Merge branch 'beta'Rainer Gerhards2009-05-293-18/+25
|\| |
| * | Merge branch 'v3-stable' into betaRainer Gerhards2009-05-291-0/+1
| |\|
| | * fixed copy&paste error in previous commitRainer Gerhards2009-05-292-1/+2
| | | | | | | | | | | | (testcase was only present in v4, so I did not spot the issue immediately)
| * | Merge branch 'v3-stable' into betaRainer Gerhards2009-05-293-18/+24
| |\| | | | | | | | | | | | | Conflicts: ChangeLog
| | * fixed problem in syslog-protocol (now RFC5424) parserRainer Gerhards2009-05-293-17/+25
| | | | | | | | | | | | ... as well as some other minor issues.
* | | added forgotten fileRainer Gerhards2009-05-291-0/+0
| | |
* | | Merge branch 'beta' into masterRainer Gerhards2009-05-289-5/+84
|\| | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| * | Merge branch 'v3-stable' into betaRainer Gerhards2009-05-2811-5/+86
| |\| | | | | | | | | | | | | Conflicts: tests/Makefile.am
| | * small enhancement: config validation run now exits with code 1 if an error ↵Rainer Gerhards2009-05-289-4/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is detected. This change is considered important but small enough to apply it directly to the stable version. [But it is a border case, the change requires more code than I had hoped. Thus I have NOT tried to actually catch all cases, this is left for the current devel releases, if necessary]
| | * bugfix: internal messages were emitted to whatever file had fd2varmojfekoj2009-05-282-1/+4
| | | | | | | | | | | | | | | | | | ...when rsyslogd ran in forked mode (as usual!) Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
| | * relaxed GnuTLS version requirement to 1.4.0Rainer Gerhards2009-05-192-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | after confirmation from the field that this version is sufficient. I always thought so (I think I developed under 1.4.x), but had no longer an environment to verify. Most imporantly, this means that Centos users will have much less trouble building rsyslog/tls support.
| | * bugfix: potential segfault issue when multiple $UDPServerRun directives are ↵Rainer Gerhards2009-05-122-1/+3
| | | | | | | | | | | | | | | | | | specified. Thanks to Michael Biebl for helping to debug this one.
| | * patch from Michael Biebl did not apply completely - manually done...Rainer Gerhards2009-05-121-0/+1
| | |
| | * Fix compiler warningsMichael Biebl2009-05-121-0/+1
| | | | | | | | | | | | Include <string.h> for memcpy and strlen.
* | | doc: added info on when $OptimizeForUniprocessor was made availableRainer Gerhards2009-05-281-1/+1
| | |
* | | Merge branch 'diag'Rainer Gerhards2009-05-286-6/+8
|\ \ \
| * | | fixed make distcheckRainer Gerhards2009-05-286-6/+8
| | | |
* | | | Merge branch 'diag'Rainer Gerhards2009-05-2720-217/+317
|\| | |
| * | | fixed typoRainer Gerhards2009-05-271-3/+1
| | | |
| * | | greatly enhanced testbenchRainer Gerhards2009-05-2720-217/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The imdiag module now can very effectively inject messages, which also frees us from uncertainties of tcp reception and processing. All shell script based tests have been modularized, what makes it far easier to create new tests. Also, the test bench now executes more reliable and much faster, because we can now rely on actual engine information where we previously did just a dumb sleep.
* | | | Merge branch 'diag'Rainer Gerhards2009-05-254-1/+92
|\| | |