summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* finishing touches for 5.1.2v5.1.2Rainer Gerhards2009-07-084-4/+14
|
* Merge branch 'v4-devel'Rainer Gerhards2009-07-0812-252/+397
|\ | | | | | | | | | | Conflicts: runtime/debug.h runtime/stream.c
| * added capability to write incomplete buffers after an inactivity timeoutRainer Gerhards2009-07-072-7/+40
| | | | | | | | | | | | for the stream class and thus finally activating omfile's timeout capability in a useful way without polling and too-high performance overhead.
| * fixed a bug introduced today that lead to an abort in queue disk modeRainer Gerhards2009-07-074-11/+15
| |
| * Merge branch 'v4-beta' into v4-develRainer Gerhards2009-07-072-10/+17
| |\
| * | solved a race conditionRainer Gerhards2009-07-074-16/+52
| | |
| * | clean solution for "writing" arbrietary-size user buffers to a streamRainer Gerhards2009-07-071-42/+28
| | |
| * | stream now uses a singular buffer strucuture for writingRainer Gerhards2009-07-071-6/+12
| | |
| * | moved locking primitivesRainer Gerhards2009-07-071-3/+19
| | |
| * | moved zip part to writer threadRainer Gerhards2009-07-062-71/+91
| | | | | | | | | | | | | | | | | | ... this is necessary in preparation for the final solution (we need to have a "unified" writer). If it causes worse performance to have the zip writher togehter with the synchronous write, we may do an async write...
| * | some minor cleanupRainer Gerhards2009-07-062-17/+18
| | |
| * | Merge branch 'v4-beta' into v4-develRainer Gerhards2009-07-062-2/+4
| |\ \
| * | | first shot at asynchronous stream writer with timeout capabilityRainer Gerhards2009-07-0612-89/+201
| | | | | | | | | | | | | | | | | | | | ... seems to work on quick testing, but needs a far more testing and improvement. Good milestone commit.
* | | | Merge branch 'v4-beta'Rainer Gerhards2009-07-073-18/+35
|\ \ \ \ | | |_|/ | |/| |
| * | | bugfix: property msg was lost when working with disk queuesRainer Gerhards2009-07-072-6/+13
| | | |
| * | | bugfix: properties inputname, fromhost, fromhost-ip were lostRainer Gerhards2009-07-072-5/+5
| | |/ | |/| | | | | | | ... when working with disk queues.
| * | performance enhancement: much faster, up to twice as fastRainer Gerhards2009-07-062-2/+4
| |/ | | | | | | | | | | (depending on configuration). This was a small change, but with big results. There is more potential to explore, but the effects were so dramatic that I think it makes sense to include this fix.
| * bugfix: abort condition when RecvFrom was not set and message reduction was onRainer Gerhards2009-07-062-6/+14
| | | | | | | | Happend e.g. with imuxsock.
* | re-enabled a testRainer Gerhards2009-07-031-2/+2
| |
* | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit (git 2.34.1) at 2024-04-27 00:05:02 +0000