Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'beta' | Rainer Gerhards | 2009-07-16 | 2 | -3/+10 |
|\ | | | | | | | | | | | Conflicts: runtime/wti.c runtime/wtp.c | ||||
| * | calls to prctl() need to be based on configure results (cross-platform issue) | Rainer Gerhards | 2009-07-16 | 2 | -3/+5 |
| | | | | | | | | | | This is for another prctl() call, not present in the beta version (looks like it would make sense to stick these into a utility function) | ||||
| * | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-07-16 | 1 | -2/+5 |
| |\ | |||||
| | * | calls to prctl() need to be based on configure results (cross-platform issue) | Rainer Gerhards | 2009-07-16 | 1 | -2/+5 |
| | | | |||||
* | | | some code simplification | Rainer Gerhards | 2009-07-16 | 4 | -14/+11 |
| | | | |||||
* | | | Merge branch 'detached' into master | Rainer Gerhards | 2009-07-15 | 4 | -209/+16 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: tests/nettester.c | ||||
| * | | | further reduction in code size/complexity due to design change | Rainer Gerhards | 2009-07-08 | 4 | -40/+3 |
| | | | | |||||
| * | | | simplified worker thread handling | Rainer Gerhards | 2009-07-08 | 4 | -171/+15 |
| | | | | | | | | | | | | | | | | | | | | based on now working with detached threads. This is probably the biggest patch in this series and with large bug potential. | ||||
* | | | | some more (very mild) cleanup | Rainer Gerhards | 2009-07-15 | 1 | -1/+0 |
| | | | | |||||
* | | | | some mild restart-type HUP cleanup | Rainer Gerhards | 2009-07-15 | 2 | -19/+5 |
| | | | | | | | | | | | | | | | | | | | | ... only those things that were obvious (and puzzled people looking at the code without konwing the subtle issues of HUP ;)). | ||||
* | | | | $HUPisRestart removed | Rainer Gerhards | 2009-07-15 | 2 | -7/+1 |
| | | | | | | | | | | | | | | | | | | | | ... but the rest of the code is not yet cleaned-up. Will do that slowly over time... (huge potential, but must be done carefully) | ||||
* | | | | Merge branch 'beta' | Rainer Gerhards | 2009-07-15 | 1 | -2/+2 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
| * | | | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-07-15 | 1 | -2/+2 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | CONFIG CHANGE: $HUPisRestart default is now "off". | Rainer Gerhards | 2009-07-15 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | We are doing this to support removal of restart-type HUP in v5. Elaborate doc added to explain reasoning and actions to be taken. | ||||
* | | | | Merge branch 'omudpspoof' | Rainer Gerhards | 2009-07-10 | 1 | -0/+3 |
|\ \ \ \ | |||||
| * | | | | done implementing omudpspoof | Rainer Gerhards | 2009-07-10 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is now a "good" rsyslog output module, working as usual. I've also sorted out some reentrency issues. Code is clean and ready to be tested in practice ;) | ||||
| * | | | | commiting interim version with ability to specify spoof source | Rainer Gerhards | 2009-07-09 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v4-devel' | Rainer Gerhards | 2009-07-10 | 1 | -1/+0 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-07-10 | 1 | -1/+0 |
| |\| | | |||||
| | * | | bugfix: potential segfault when zip-compressed syslog records were received ↵ | Rainer Gerhards | 2009-07-10 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | (double free) | ||||
* | | | | Merge branch 'master' into udpspoof & cleanup & slight optimization | Rainer Gerhards | 2009-07-09 | 3 | -169/+191 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c I messed up and did some changes during the merge commit ;) But these are not large, just a little bit of cleanup and some very slight optimizations inside the msg object. | ||||
| * | | | | Merge branch 'v4-devel' | Rainer Gerhards | 2009-07-09 | 3 | -158/+172 |
| |\| | | | | |_|/ | |/| | | |||||
| | * | | small performance improvement and cleanup | Rainer Gerhards | 2009-07-09 | 3 | -158/+172 |
| | | | | | | | | | | | | | | | | | | | | | | | | optimized substring processing, should bring a small enhancement when forwarding with the default forwarding templates. Also did some uchar cleanup in msg.c (thus so many changes, in reality they are few...). | ||||
| | * | | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-07-09 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | | | | Conflicts: tests/nettester.c | ||||
| | | * | bugfix: message could be truncated after TAG, often when forwarding | Rainer Gerhards | 2009-07-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | This was a result of an internal processing error if maximum field sizes had been specified in the property replacer. Also did some testbench improvements, including omstdout. | ||||
* | | | | bugfix: message could be truncated after TAG, often when forwarding | Rainer Gerhards | 2009-07-09 | 1 | -1/+1 |
|/ / / | | | | | | | | | | | | | This was a result of an internal processing error if maximum field sizes had been specified in the property replacer. | ||||
* | | | optimizing queue thread handling | Rainer Gerhards | 2009-07-08 | 2 | -4/+8 |
| | | | | | | | | | | | | | | | | | | ... first commit in a series of more. Makes worker threads detached. Needs more testing (will be done soon) and if it works as expected, we can further reduce code. | ||||
* | | | finishing touches for 5.1.2v5.1.2 | Rainer Gerhards | 2009-07-08 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'v4-devel' | Rainer Gerhards | 2009-07-08 | 6 | -239/+369 |
|\| | | | | | | | | | | | | | | | | | Conflicts: runtime/debug.h runtime/stream.c | ||||
| * | | added capability to write incomplete buffers after an inactivity timeout | Rainer Gerhards | 2009-07-07 | 2 | -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 mode | Rainer Gerhards | 2009-07-07 | 3 | -10/+14 |
| | | | |||||
| * | | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-07-07 | 1 | -10/+15 |
| |\| | |||||
| * | | solved a race condition | Rainer Gerhards | 2009-07-07 | 3 | -15/+51 |
| | | | |||||
| * | | clean solution for "writing" arbrietary-size user buffers to a stream | Rainer Gerhards | 2009-07-07 | 1 | -42/+28 |
| | | | |||||
| * | | stream now uses a singular buffer strucuture for writing | Rainer Gerhards | 2009-07-07 | 1 | -6/+12 |
| | | | |||||
| * | | moved locking primitives | Rainer Gerhards | 2009-07-07 | 1 | -3/+19 |
| | | | |||||
| * | | moved zip part to writer thread | Rainer Gerhards | 2009-07-06 | 1 | -69/+89 |
| | | | | | | | | | | | | | | | | | | ... 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 cleanup | Rainer Gerhards | 2009-07-06 | 2 | -17/+18 |
| | | | |||||
| * | | Merge branch 'v4-beta' into v4-devel | Rainer Gerhards | 2009-07-06 | 1 | -2/+2 |
| |\ \ | |||||
| * | | | first shot at asynchronous stream writer with timeout capability | Rainer Gerhards | 2009-07-06 | 5 | -74/+171 |
| | | | | | | | | | | | | | | | | | | | | ... seems to work on quick testing, but needs a far more testing and improvement. Good milestone commit. | ||||
* | | | | Merge branch 'v4-beta' | Rainer Gerhards | 2009-07-07 | 2 | -18/+29 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | bugfix: property msg was lost when working with disk queues | Rainer Gerhards | 2009-07-07 | 1 | -5/+12 |
| | | | | |||||
| * | | | bugfix: properties inputname, fromhost, fromhost-ip were lost | Rainer Gerhards | 2009-07-07 | 1 | -5/+3 |
| | |/ | |/| | | | | | | | ... when working with disk queues. | ||||
| * | | performance enhancement: much faster, up to twice as fast | Rainer Gerhards | 2009-07-06 | 1 | -2/+2 |
| |/ | | | | | | | | | | | (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 on | Rainer Gerhards | 2009-07-06 | 1 | -6/+12 |
| | | | | | | | | Happend e.g. with imuxsock. | ||||
* | | Merge branch 'v5-devel' | Rainer Gerhards | 2009-07-03 | 19 | -672/+1280 |
|\ \ | |/ |/| | | | | | | | Conflicts: ChangeLog runtime/datetime.c | ||||
| * | Merge branch 'master' into v5-devel | Rainer Gerhards | 2009-07-01 | 17 | -197/+569 |
| |\ | |||||
| * | | fixed small compile issue | Rainer Gerhards | 2009-06-27 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into v5-devel | Rainer Gerhards | 2009-06-26 | 8 | -196/+357 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h | ||||
| * \ \ | Merge branch 'master' into v5-devel | Rainer Gerhards | 2009-06-26 | 8 | -235/+149 |
| |\ \ \ |