summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into multi-dequeueRainer Gerhards2009-04-232-5/+16
|\|
| * Merge branch 'beta'Rainer Gerhards2009-04-232-7/+20
| |\ | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * bugfix: compile problems in im3195Rainer Gerhards2009-04-232-1/+3
| | |
| | * Merge branch 'v3-stable' into betaRainer Gerhards2009-04-232-6/+16
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/queue.c
| | | * bugfix: light and full delay watermarks had invalid valuesRainer Gerhards2009-04-232-6/+12
| | | | | | | | | | | | | | | | | | | | ... badly affecting performance for delayable inputs (but not causeing any other issues)
| | * | preparing for 4.1.7v4.1.7Rainer Gerhards2009-04-223-3/+3
| | | |
* | | | improving debugging info a bitRainer Gerhards2009-04-232-3/+7
| | | |
* | | | added test for DA queue mode (in main msg queue) - needs more workRainer Gerhards2009-04-224-7/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that the rsyslog engine writes messages too quickly, so that the queue never enters DA mode. We still have some look contemption. One possible solution (hopefully) is to finally move the parser code out of imtcp and onto the next thread. Need to address these issues first, then come back to the test case.
* | | | now batches are handed down to the actual consumerRainer Gerhards2009-04-224-29/+66
| | | | | | | | | | | | | | | | | | | | | | | | ... but the action consumer does not do anything really intelligent with them. But the DA consumer is already done, as is the main message queue consumer.
* | | | first attempt at dequeueing multiple batches inside the queueRainer Gerhards2009-04-227-79/+149
| | | | | | | | | | | | | | | | | | | | | | | | ... but this code has serious problems when terminating the queue, also it is far from being optimal. I will commit a series of patches (hopefully) as I am on the path to the final implementation.
* | | | Merge branch 'master' into multi-dequeueRainer Gerhards2009-04-2236-52/+446
|\| | |
| * | | another typo fix...Rainer Gerhards2009-04-221-1/+1
| | | |
| * | | typo fix (important typo)Rainer Gerhards2009-04-211-1/+1
| | | |
| * | | doc status update & typo fixesRainer Gerhards2009-04-212-24/+24
| | | |
| * | | Merge branch 'nextmaster'Rainer Gerhards2009-04-2176-268/+2501
| |\ \ \ | | |/ / | |/| |
| | * | doc: added (hopefully) easier to grasp queue explanationRainer Gerhards2009-04-2122-5/+286
| | | |
| | * | improved testbench - added tests for queue disk-only modeRainer Gerhards2009-04-174-1/+52
| | | |
| | * | some cleanupRainer Gerhards2009-04-175-3/+6
| | | | | | | | | | | | | | | | | | | | ... mostly removal of compile-time warnings (thanks to Michael Biebl for suggesting to look after that)
| | * | update project status & cleanupRainer Gerhards2009-04-173-30/+32
| | | | | | | | | | | | | | | | | | | | | | | | removed some warning in imklog compilation, but may not have solved a lurking issue (but placed comment so that we know if something surfaces)
| | * | bugfix: missing header (platform compatibility issue)v4.3.0Rainer Gerhards2009-04-171-0/+1
| | | |
| | * | preparing for 4.3.0 releaseRainer Gerhards2009-04-173-3/+8
| | | |
| | * | Merge branch 'master' into nextmasterRainer Gerhards2009-04-172-9/+58
| | |\ \
| * | \ \ Merge branch 'master' into betaRainer Gerhards2009-04-21167-1958/+5457
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | highlighted bugfix imported from betaRainer Gerhards2009-04-171-0/+5
| | | |
| | * | Merge branch 'beta'Rainer Gerhards2009-04-172-9/+53
| | |\ \
| * | | | preparing for 3.22.0 (move to stable)v3.22.0Rainer Gerhards2009-04-213-3/+5
| | |/ / | |/| |
| * | | highlighted bugfix imported from v2-stableRainer Gerhards2009-04-171-0/+5
| | | |
| * | | Merge branch 'v3-stable' into betaRainer Gerhards2009-04-172-9/+48
| |\ \ \
| | * \ \ Merge branch 'debian_lenny' into v3-stableRainer Gerhards2009-04-172-9/+48
| | |\ \ \
| | | * \ \ Merge branch 'v2-stable' into debian_lennyRainer Gerhards2009-04-172-9/+48
| | | |\ \ \
| | | | * | | bugfix: ompgsql did not detect problems in sql command executionRainer Gerhards2009-04-172-9/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this could cause loss of messages. The handling was correct if the connection broke, but not if there was a problem with statement execution. The most probable case for such a case would be invalid sql inside the template, and this is now much easier to diagnose.
* | | | | | | some cleanupRainer Gerhards2009-04-171-39/+0
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'nextmaster' into oracleRainer Gerhards2009-04-1622-181/+581
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| * \ \ \ \ \ Merge branch 'master' into nextmasterRainer Gerhards2009-04-162-5/+20
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | highlighting $DirCreateMode fixRainer Gerhards2009-04-161-0/+3
| | | | | | |
| | * | | | | Merge branch 'beta'Rainer Gerhards2009-04-162-5/+17
| | |\| | | |
| | | * | | | Merge branch 'v3-stable' into betaRainer Gerhards2009-04-162-5/+17
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | | | * | | preparing for 3.20.6v3.20.6Rainer Gerhards2009-04-163-3/+4
| | | | | | |
| | | | * | | Merge branch 'debian_lenny' into v3-stableRainer Gerhards2009-04-162-4/+12
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| | | | | * | Merge branch 'v2-stable' into debian_lennyRainer Gerhards2009-04-163-3/+14
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html
| | | | | | * prepared for 2.0.7 & corrected default for $DirCreatemodev2.0.7Rainer Gerhards2009-04-144-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: the default for $DirCreateMode was 0644, and as such wrong. It has now been changed to 0700. For some background, please see http://lists.adiscon.net/pipermail/rsyslog/2009-April/001986.html
| * | | | | | cosmetic fix (status message)Rainer Gerhards2009-04-091-2/+0
| | | | | | |
| * | | | | | Merge branch 'setrlimit' into nextmasterRainer Gerhards2009-04-090-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'setrlimit' of git+ssh://rger@git.adiscon.com/git/rsyslog into ↵Rainer Gerhards2009-04-094-12/+48
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | setrlimit
| * | | | | | | | Merge branch 'setrlimit' into nextmasterRainer Gerhards2009-04-091-1/+10
| |\| | | | | | |
| | * | | | | | | removed MSG_NOSIGNAL & provided work-aroundRainer Gerhards2009-04-091-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as this send() option is not supported on Solaris. We now simply ignore SIGPIPE
| * | | | | | | | updated project statusRainer Gerhards2009-04-141-4/+4
| | | | | | | | |
| * | | | | | | | Merge branch 'omprog' into nextmasterRainer Gerhards2009-04-1410-141/+392
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h
| | * | | | | | | improved omprog, now ready for first practical testingRainer Gerhards2009-04-013-8/+165
| | | | | | | | |
| | * | | | | | | initial work on omprog, an output module to send messages to another programRainer Gerhards2009-04-018-22/+116
| | | | | | | | |