summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* finishing touches for 5.1.1v5.1.1Rainer Gerhards2009-07-031-1/+1
|
* Merge branch 'v5-devel'Rainer Gerhards2009-07-0352-858/+3661
|\ | | | | | | | | | | Conflicts: ChangeLog runtime/datetime.c
| * added yet another forgotten file...Rainer Gerhards2009-07-021-0/+1
| |
| * Merge branch 'master' into v5-develRainer Gerhards2009-07-027-8/+284
| |\ | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | fixed missing file in distribution tarballRainer Gerhards2009-07-021-0/+1
| | |
| * | Merge branch 'master' into v5-develRainer Gerhards2009-07-0135-282/+1003
| |\ \
| * | | fixed small compile issueRainer Gerhards2009-06-271-1/+1
| | | |
| * | | Merge branch 'master' into v5-develRainer Gerhards2009-06-2610-207/+364
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| * \ \ \ Merge branch 'master' into v5-develRainer Gerhards2009-06-2616-240/+231
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into v5-develRainer Gerhards2009-06-256-18/+29
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c
| * | | | | | bugfix: subtle synchronization issueRainer Gerhards2009-06-253-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This may have caused a segfault under strange circumstances (but if we just run long enough with a high enough message volume, even the strangest circumstances will occur...)
| * | | | | | improvements/fixes in queue termination timeout handlingRainer Gerhards2009-06-254-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: subtle (and usually irrelevant) issue in timout processing timeout could be one second too early if nanoseconds wrapped - set a more sensible timeout for shutdow, now 1.5 seconds to complete processing (this also removes those cases where the shutdown message was not written because the termination happened before it)
| * | | | | | Merge branch 'master' into v5-develRainer Gerhards2009-06-253-2/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/atomic.h runtime/wti.c
| * | | | | | | added a few atomic operationsRainer Gerhards2009-06-254-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mostly to get thread debugger errors clean (plus, of course, it makes things more deterministic)
| * | | | | | | bugfix: mutex was sometimes released when not being heldRainer Gerhards2009-06-241-4/+8
| | | | | | | |
| * | | | | | | Merge branch 'master' into v5-develRainer Gerhards2009-06-242-0/+4
| |\ \ \ \ \ \ \
| * | | | | | | | quick and dirty fix for one race conditionRainer Gerhards2009-06-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is intentionally quick & dirty, as I would like to do some better patch, if possible. For that, I probably need the commented-out code, thus no delete.
| * | | | | | | | Merge branch 'master' into v5-develRainer Gerhards2009-06-243-15/+17
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IMPORTANT: this merge did NOT include the (important) changes to action.c . Consolidating them was too hard (aka "error-prone") because of the large differences in the code base. The fixes will be redone with a later commit. Conflicts: action.c configure.ac doc/manual.html
| * | | | | | | | | updated project statusRainer Gerhards2009-06-243-11/+20
| | | | | | | | | |
| * | | | | | | | | Merge branch 'omfile' into v5-develRainer Gerhards2009-06-2316-231/+253
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| * \ \ \ \ \ \ \ \ \ Merge branch 'omfile' into v5-develRainer Gerhards2009-06-224-38/+17
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | adapted (and improved) input batching to v5 engineRainer Gerhards2009-06-221-1/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'omfile' into v5-develRainer Gerhards2009-06-224-45/+40
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'omfile' into v5-develRainer Gerhards2009-06-222-1/+19
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | bugfix: huge memory leak in queue engineRainer Gerhards2009-06-222-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (made rsyslogd unusable in production). Occured if at least one queue was in direct mode (the default for action queues).
| * | | | | | | | | | | | | some post-merge cleanupRainer Gerhards2009-06-222-7/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'omfile' into tmpRainer Gerhards2009-06-2271-798/+1551
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a complex manual merge, especially in action.c. So if there occur some problems, this would be a good point to start troubleshooting. I run a couple of tests before commiting and they all went well. Conflicts: action.c action.h runtime/queue.c runtime/queue.h runtime/wti.c runtime/wti.h
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'omfile' into v5-develRainer Gerhards2009-06-1679-1607/+3847
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that this was NOT a trivial merge, and there may be some issues. This needs to be seen when we continue developing. Conflicts: runtime/msg.h runtime/obj.h runtime/queue.c runtime/srUtils.h runtime/stream.c runtime/stream.h runtime/wti.c tests/Makefile.am tools/omfile.c tools/syslogd.c
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into v5-develRainer Gerhards2009-06-042-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h tests/Makefile.am
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into v5-develRainer Gerhards2009-06-0421-27/+1641
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into v5-develRainer Gerhards2009-05-291-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into v5-develRainer Gerhards2009-05-294-18/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | preparing for 5.1.0 releasev5.1.0Rainer Gerhards2009-05-293-3/+28
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' into v5-develRainer Gerhards2009-05-2810-5/+85
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| * | | | | | | | | | | | | | | | | | | | some cleanup & fix make distcheckRainer Gerhards2009-05-286-20/+9
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into v5-develRainer Gerhards2009-05-286-6/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am tests/diag.sh
| * | | | | | | | | | | | | | | | | | | | | some more fixes for queue engineRainer Gerhards2009-05-288-42/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The enhanced testbench now runs without failures, again
| * | | | | | | | | | | | | | | | | | | | | fixing an issue during DA mode queue shutdownRainer Gerhards2009-05-286-69/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also changed DA queue mode in that the regular workers now run concurrently.
| * | | | | | | | | | | | | | | | | | | | | begun rsyslog v5 branch (for ultra-reliable queue)Rainer Gerhards2009-05-282-1/+3
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | preserving current changesRainer Gerhards2009-05-285-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... in preparation for some larger changes - I need to apply some serious design changes, as the current system does not play well at all with ultra-reliable queues. Will do that in a totally new version.
| * | | | | | | | | | | | | | | | | | | | | interim commit: working on failure casesRainer Gerhards2009-05-2710-115/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | slightly improved situation, would like to save it before carrying on
| * | | | | | | | | | | | | | | | | | | | | adapted testbench to new capabilitiesRainer Gerhards2009-05-2713-102/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and now make check fails again, we have obviously found some new bugs thanks to the additional cases
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into ultra-reliableRainer Gerhards2009-05-2720-222/+317
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am tests/diskqueue.sh tests/imtcp-multiport.sh tests/manytcp.sh tests/memq-persist.sh
| * | | | | | | | | | | | | | | | | | | | | | solved design issue with queue terminationRainer Gerhards2009-05-2617-136/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and also improved the test suite. There is a design issue in the v3 queue engine that manifested to some serious problems with the new processing mode. However, in v3 shutdown may take eternally if a queue runs in DA mode, is configured to preserve data AND the action fails and retries immediately. There is no cure available for v3, it would require doing much of the work we have done on the new engine. The window of exposure, as one might guess from the description, is very small. That is probably the reason why we have not seen it in practice.
| * | | | | | | | | | | | | | | | | | | | | | fixing some minor nitsRainer Gerhards2009-05-253-4/+5
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into ultra-reliableRainer Gerhards2009-05-255-5/+98
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ultra-reliableRainer Gerhards2009-05-2510-17/+105
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ultra-reliableRainer Gerhards2009-05-254-62/+60
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ultra-reliableRainer Gerhards2009-05-2522-83/+290
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am tests/diskqueue.sh
| * | | | | | | | | | | | | | | | | | | | | | | | | | minor cleanup: remove compiler warningRainer Gerhards2009-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | |
generated by cgit (git 2.34.1) at 2024-05-03 07:48:08 +0000