summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'oracle' into v4-develRainer Gerhards2009-11-122-11/+64
|\
| * Give even better outputLuis Fernando Munoz Mejias2009-11-121-9/+23
| | | | | | | | | | Tell which statement is failing, which element in the batch, and give its details.
| * Improve the debug messagesLuis Fernando Munoz Mejias2009-11-121-8/+8
| | | | | | | | Improve traceability while testing.
| * Debug output to find out a crashLuis Fernando Munoz Mejias2009-11-121-1/+5
| |
| * Report errors when OCI_SUCCESS_WITH_INFO happensLuis Fernando Munoz Mejias2009-11-121-1/+29
| |
| * Improve the handling of OCI_SUCCESS_WITH_INFO.Luis Fernando Munoz Mejias2009-11-121-3/+6
| | | | | | | | | | Stop considering it as an error, and make it display the information from the Oracle server.
| * docLuis Fernando Munoz Mejias2009-11-122-8/+9
| |
| * If the server disconnects the handle is no longer valid and we need toLuis Fernando Munoz Mejias2009-11-121-0/+3
| | | | | | | | | | call tryResume(), so we have to return RS_RET_SUSPENDED. Otherwise, we may keep losing messages until rsyslog is restarted.
* | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-11-123-4/+9
|\ \ | |/ |/|
| * Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-11-123-4/+9
| |\
| | * cosmetic: mention imported v3-bugfix in ChangeLogRainer Gerhards2009-11-121-0/+2
| | |
| | * Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-11-123-4/+7
| | |\
| | | * bugfix: segfault on startup when -q or -Q option was givenRainer Gerhards2009-11-123-4/+7
| | | | | | | | | | | | | | | | | | | | bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=157 Thanks to Jonas Nogueira for reporting this bug.
* | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-11-126-1/+55
|\| | |
| * | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-11-126-1/+55
| |\| | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| | * | bugfix: $ActionExecOnlyOnceEveryInterval did not work.Rainer Gerhards2009-11-126-1/+52
| | | | | | | | | | | | | | | | | | | | | | | | This was a regression from the time() optimizations done in v4. Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=143 Thanks to Klaus Tachtler for reporting this bug.
* | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-11-1120-17/+306
|\| | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| * | | somewhat enhanced test suiteRainer Gerhards2009-11-1119-29/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also prepared test case for TLS testing, but not activated it inside the build itself. A note on TLS testing: the current testsuite (in git!) already contains TLS test cases. However, getting these test cases correct is not simple. That's not a problem with the code itself, but rater a problem with synchronization in the test environment. So I have deciced to keep the TLS tests in, but not yet actually utilize them. This is most probably left as an excercise for future (devel) releases.
| * | | testbench improvement: gzip-plain-tcp mode is now being testedRainer Gerhards2009-11-117-21/+71
| | | | | | | | | | | | | | | | | | | | ... also improved two-instance test mechanism, now have a generic approach.
| * | | added support for dual-rsyslogd-instance test cases to testbenchRainer Gerhards2009-11-116-17/+98
| | | | | | | | | | | | | | | | ... plus a simple initial test of the tcp forwarding capability.
* | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-11-104-26/+156
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | doc: added reasoning for why use env vars to configure debug systemRainer Gerhards2009-11-101-2/+22
| | | |
| * | | added a so-called "On Demand Debug" modeRainer Gerhards2009-11-104-23/+132
| | | | | | | | | | | | | | | | | | | | | | | | in which debug output can be generated only after the process has started, but not right from the beginning. This is assumed to be useful for hard-to-find bugs. Also improved the doc on the debug system.
| * | | bumped version numberRainer Gerhards2009-11-051-0/+2
| | | |
| * | | preparing for 4.5.6v4.5.6Rainer Gerhards2009-11-051-1/+1
| | | |
* | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-11-0513-17/+92
|\| | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| * | | added pipe action test to testbench & testbench bugfixRainer Gerhards2009-11-0510-14/+74
| | | |
| * | | bugfix: named pipes did no longer work (they always got an open error)Rainer Gerhards2009-11-053-2/+10
| | | | | | | | | | | | | | | | this was a regression from the omfile rewrite in 4.5.0
| * | | bugfix(testbench): testcase did not properly wait for rsyslod shutdownRainer Gerhards2009-10-302-1/+8
| | | | | | | | | | | | | | | | | | | | thus some unpredictable behavior and a false negative test result could occur. [BACKPORTED from v5]
* | | | added function getenv() to RainerScriptRainer Gerhards2009-11-038-12/+111
| | | |
* | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-10-212-4/+7
|\| | |
| * | | Merge branch 'v4-stable' into v4-betaRainer Gerhards2009-10-212-3/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imrelp/imrelp.c
| | * | bumped version numberRainer Gerhards2009-10-203-4/+6
| | | |
| | * | added imported bugfix to changelogRainer Gerhards2009-10-201-0/+2
| | | |
| | * | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-10-202-2/+1
| | |\|
| | | * bugfix: potential hang condition on queue shutdownRainer Gerhards2009-10-202-2/+1
| | | |
| | * | Merge branch 'v3-stable' into v4-stableRainer Gerhards2009-10-143-5/+9
| | |\| | | | | | | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c
| | * | preparing for 4.4.2 releasev4.4.2Rainer Gerhards2009-10-091-1/+1
| | | |
| * | | Merge branch 'aaron' into v4-betaRainer Gerhards2009-10-211-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | * | | preparing for 4.5.5v4.5.5Rainer Gerhards2009-10-211-1/+1
| | | | |
* | | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-10-143-4/+9
|\| | | |
| * | | | Merge branch 'v3-stable' into v4-betaRainer Gerhards2009-10-143-4/+9
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Conflicts: plugins/imrelp/imrelp.c
| | * | | enhance: imrelp now also provides remote peer's IP addressRainer Gerhards2009-10-143-4/+9
| | | | | | | | | | | | | | | | | | | | [if librelp != 1.0.0 is used]
* | | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-10-142-1/+7
|\| | | |
| * | | | bugfix(minor): diag function returned wrong queue memeber countRainer Gerhards2009-10-142-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...for the main queue if an active DA queue existed. This had no relevance to real deployments (assuming they are not running the debug/diagnostic module...), but sometimes caused grief and false alerts in the testbench.
* | | | | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-10-085-5/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/omfile.c
| * | | | Merge branch 'aaron' into v4-betaRainer Gerhards2009-10-082-1/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | bugfix: debug string larger than 1K were improperly displayed.Rainer Gerhards2009-10-082-1/+3
| | | | | | | | | | | | | | | | | | | | Max size is now 32K.
| * | | | Merge branch 'aaron' into v4-betaRainer Gerhards2009-10-054-4/+12
| |\| | |
| | * | | bugfix: invalid storage class selected for some size config parameters.Rainer Gerhards2009-10-053-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resulted in wrong values. The most prominent victim was the directory creation mode, which was set to zero in some cases. For details, see related blog post: http://blog.gerhards.net/2009/10/another-note-on-hard-to-find-bugs.html This replaces the improper bugfix from two commits ago with a proper one.