summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * optimized template string generationRainer Gerhards2009-06-197-91/+125
| |
| * switched default to keep in line with traditional syslogd behaviourRainer Gerhards2009-06-192-4/+7
| |
| * optimized action.c a bitRainer Gerhards2009-06-192-24/+21
| |
| * removed pthread_testcancel() as it is no longer necessaryRainer Gerhards2009-06-191-22/+0
| | | | | | | | | | | | | | we usually stay long enough inside the actions, so there should be no problem with reaching a cancellation point. Actually, if we really need to cancel, the thread is in an output action (otherwise it would have willingly terminated).
| * removed uniprocessor optimizationRainer Gerhards2009-06-197-42/+8
| | | | | | | | | | | | ... as it was not even optimal on uniprocessors any longer ;) I keep the config directive in, maybe we can utilize it again at some later point in time (questionable).
| * typo fixRainer Gerhards2009-06-191-1/+1
| |
| * some cleanupRainer Gerhards2009-06-192-11/+14
| |
| * fully optimized datetime module and enhanced test suiteRainer Gerhards2009-06-1931-110/+298
| | | | | | | | tests for the various timestamp formats have been added
| * optimized rfc3339 timestamp string generationRainer Gerhards2009-06-191-30/+73
| |
| * fixed abort condition with oversize tagsRainer Gerhards2009-06-185-23/+16
| | | | | | | | this was a regression I introduced this afternoon
| * optimized handling of MSG part in msg objectRainer Gerhards2009-06-186-16/+33
| | | | | | | | | | WARNING: currently, message repeation processing is disabled, must be reenabled (but prefer to do some other tests first)
| * slight optimization of template generationRainer Gerhards2009-06-184-7/+15
| |
| * some optimization in the property replacerRainer Gerhards2009-06-181-40/+48
| |
| * optimized TAG handling in msg objectRainer Gerhards2009-06-185-52/+85
| |
| * cleaned up/optimized raw message handling in msg objectRainer Gerhards2009-06-1812-84/+77
| |
| * Merge branch 'master' into newmsgRainer Gerhards2009-06-183-5/+22
| |\ | | | | | | | | | | | | Conflicts: tools/omfile.c
| | * Merge branch 'beta'Rainer Gerhards2009-06-184-8/+25
| | |\
| | | * Merge branch 'v3-stable' into betaRainer Gerhards2009-06-184-10/+27
| | | |\
| | | | * some minor bugfixesRainer Gerhards2009-06-185-11/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: invalid error message issued if $inlcudeConfig was on an empty set of files (e.g. *.conf, where none such files existed) thanks to Michael Biebl for reporting this bug - bugfix: when run in foreground (but not in debug mode), a debug message ("DoDie called") was emitted at shutdown. Removed. thanks to Michael Biebl for reporting this bug - bugfix: some garbagge was emitted to stderr on shutdown. This garbage consisted of file names, which were written during startup (key point: not a pointer error) thanks to Michael Biebl for reporting this bug - bugfix: startup and shutdown message were emitted to stdout thanks to Michael Biebl for reporting this bug
| | | | * removed forgotten debug messageRainer Gerhards2009-06-151-1/+0
| | | | |
| | | | * bugfix: error messages were not emitted to stderr in forked modeRainer Gerhards2009-06-152-2/+7
| | | | | | | | | | | | | | | | | | | | stderr and stdo are now kept open across fork()
| * | | | going forward in moving string-handling functions to new interface...Rainer Gerhards2009-06-1713-105/+126
| | | | |
| * | | | some more optimization in msg object string handlingRainer Gerhards2009-06-172-56/+35
| | | | |
| * | | | further optimized message objectRainer Gerhards2009-06-176-137/+234
| | | | | | | | | | | | | | | | | | | | pri, facility and severity string generation simplified
| * | | | added basic plumbing to support message properties separate from messageRainer Gerhards2009-06-164-0/+175
| | | | | | | | | | | | | | | | | | | | | | | | | will fill this with live somewhat later, noticed I need to do some stage work first (at least this is useful).
| * | | | some cleanupRainer Gerhards2009-06-161-6/+4
| | | | |
| * | | | implemented first version of multi-enqueue support, queue sideRainer Gerhards2009-06-163-2/+128
| | | | |
| * | | | milestone: input-side multiSubmit capabilityRainer Gerhards2009-06-164-11/+64
| | | | | | | | | | | | | | | | | | | | ... commit before I try to touch the queue side ;)
* | | | | 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
| * | | | fixing problems that occurred during the last mergeRainer Gerhards2009-06-162-293/+0
| | | | |
| * | | | minor cleanupRainer Gerhards2009-06-162-3/+0
| | | | |
| * | | | Merge branch 'master' into omfileRainer Gerhards2009-06-1629-502/+699
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/msg.h tcps_sess.c tcpsrv.c tools/syslogd.c
| | * | | removed long-obsoleted property UxTradMsgRainer Gerhards2009-06-168-77/+65
| | | | | | | | | | | | | | | | | | | | | | | | | ... as well as some cleanup (some commented-out code is left to support UxTradMsg again is someone really complains ;)).
| | * | | done various optimizations to the stringbuf and its usersRainer Gerhards2009-06-1618-360/+282
| | | | |
| | * | | some performance optimizationsRainer Gerhards2009-06-1614-104/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - saved gettimeofday() calls in imtcp (and increased reception buffer) - somewhat optimized stringbuf.c - some other optimizations
| * | | | cleaned up small nitRainer Gerhards2009-06-161-1/+1
| | | | |
| * | | | omfile buffers are now synchronized after inactivityRainer Gerhards2009-06-159-43/+559
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first shot at this functionality. Currently, we run off a fixed counter in the rsyslogd mainloop, which needs to be restructured. But this code works, so it is a good time for a commit.
| * | | | fixed small bug in testbenchRainer Gerhards2009-06-123-2/+2
| | | | |
| * | | | fixed a regression from past commit & more performance enhancementRainer Gerhards2009-06-122-3/+4
| | | | | | | | | | | | | | | | | | | | a larger buffer is a cheap, yet useful, enhancement... ;)
| * | | | performance-enhanced imtcpRainer Gerhards2009-06-123-4/+40
| | | | | | | | | | | | | | | | | | | | | | | | | ...by now using lowres time and thus saving many time() calls. This needs some performance testing and must be made configurable if it works out.
| * | | | completed multi-ruleset core supportRainer Gerhards2009-06-1215-61/+226
| | | | | | | | | | | | | | | | | | | | ... as well as added multi-ruleset support for imtcp
| * | | | implemented $OMFileFlushOnTXEnd directiveRainer Gerhards2009-06-125-12/+25
| | | | | | | | | | | | | | | | | | | | plus some cleanup...
| * | | | re-enabled pipe, tty and console in omfileRainer Gerhards2009-06-1220-226/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... by moving code to stream.c. Thanks to the new design, new cases are not really needed, resulting in cleaner code. I also did a cleanup of header file usage as a side-activity.
| * | | | fixed abort when emergency configuration was activatedRainer Gerhards2009-06-122-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | this regression was introduced last friday, so this is *NOT* present in any released version.
| * | | | improved config error messagesRainer Gerhards2009-06-122-4/+14
| | | | | | | | | | | | | | | | | | | | now contain a copy of the config line that (most likely) caused the error
| * | | | re-enabled outchannel functionalityRainer Gerhards2009-06-127-88/+198
| | | | |
| * | | | added $Ruleset config commandRainer Gerhards2009-06-105-3/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so we now can define multiple rule sets, we just can not use them ;) That means we have the foundation to bind listeners to different rule sets.
| * | | | re-enabled queue disk fsync testRainer Gerhards2009-06-102-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... actually, it was not broken, but just very slow. I have now reduced the number of test messages so that make check will not be held for an extended period of time.
| * | | | fixed a small memory leak...Rainer Gerhards2009-06-104-30/+18
| | | | | | | | | | | | | | | | | | | | and another problem, both introduced today. Also did some general cleanup.