summaryrefslogtreecommitdiffstats
path: root/runtime
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into newmsgRainer Gerhards2009-06-181-1/+1
|\ | | | | | | | | Conflicts: tools/omfile.c
| * Merge branch 'beta'Rainer Gerhards2009-06-181-1/+1
| |\
| | * Merge branch 'v3-stable' into betaRainer Gerhards2009-06-181-1/+1
| | |\
| | | * some minor bugfixesRainer Gerhards2009-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | going forward in moving string-handling functions to new interface...Rainer Gerhards2009-06-1710-94/+113
| | | |
* | | | some more optimization in msg object string handlingRainer Gerhards2009-06-172-56/+35
| | | |
* | | | further optimized message objectRainer Gerhards2009-06-174-136/+233
| | | | | | | | | | | | | | | | 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-161-0/+126
| | | |
* | | | milestone: input-side multiSubmit capabilityRainer Gerhards2009-06-162-1/+14
| | | | | | | | | | | | | | | | ... commit before I try to touch the queue side ;)
* | | | minor cleanupRainer Gerhards2009-06-161-1/+0
| | | |
* | | | Merge branch 'master' into omfileRainer Gerhards2009-06-1616-339/+262
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/msg.h tcps_sess.c tcpsrv.c tools/syslogd.c
| * | | removed long-obsoleted property UxTradMsgRainer Gerhards2009-06-163-55/+56
| | | | | | | | | | | | | | | | | | | | ... 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-1614-230/+152
| | | |
| * | | some performance optimizationsRainer Gerhards2009-06-166-67/+67
| | | | | | | | | | | | | | | | | | | | | | | | - 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-157-2/+549
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | completed multi-ruleset core supportRainer Gerhards2009-06-128-21/+116
| | | | | | | | | | | | | | | | ... as well as added multi-ruleset support for imtcp
* | | | implemented $OMFileFlushOnTXEnd directiveRainer Gerhards2009-06-122-11/+6
| | | | | | | | | | | | | | | | plus some cleanup...
* | | | re-enabled pipe, tty and console in omfileRainer Gerhards2009-06-124-57/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... 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-121-1/+0
| | | | | | | | | | | | | | | | | | | | this regression was introduced last friday, so this is *NOT* present in any released version.
* | | | improved config error messagesRainer Gerhards2009-06-121-4/+12
| | | | | | | | | | | | | | | | now contain a copy of the config line that (most likely) caused the error
* | | | re-enabled outchannel functionalityRainer Gerhards2009-06-126-16/+179
| | | |
* | | | added $Ruleset config commandRainer Gerhards2009-06-103-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | 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-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | ... 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.
* | | | restructered code in perparation for multiple rule set supportRainer Gerhards2009-06-1013-55/+1022
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ... this was long overdue, and I finlly tackeld it. It turned out to be more complex than I initially thought. The next step now probably is to actually implement multiple rule sets and the beauty that comes with them.
* | | | added capability to fsync() queue disk files for enhanced reliabilityRainer Gerhards2009-06-092-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | also adds speed, because you do no longer need to run the whole file system in sync mode. New testbench and new config directives: - $MainMsgQueueSyncQueueFiles - $ActionQueueSyncQueueFiles
* | | | improved error handling and added fsync() supportRainer Gerhards2009-06-082-6/+110
| | | | | | | | | | | | | | | | | | | | | | | | ... restoring missing functionality after the restructuring of imfile. As a side-effect, this also lays the foundation for even more reliable queue engine operations (but this is not yet done).
* | | | cleanup in preparation of next stepsRainer Gerhards2009-06-051-1/+23
| | | | | | | | | | | | | | | | | | | | now cleand up omfile and straighted out some things. The only commented-out code left is code that must be moved/merged to the stream class, my next target.
* | | | added $OMFileIOBufferSize config directive and plumbingRainer Gerhards2009-06-043-21/+8
| | | |
* | | | modified stream class and omfile to work with itRainer Gerhards2009-06-043-28/+154
| | | | | | | | | | | | | | | | now some basic operations are carried out via the stream class.
* | | | cleaned up stream class ...Rainer Gerhards2009-06-046-144/+170
| | | | | | | | | | | | | | | | | | | | | | | | ... and also made it callable via an rsyslog interface rather then relying on the OS loader (important if we go for using it inside loadbale modules, which we soon possible will)
* | | | Merge branch 'master' into omfileRainer Gerhards2009-06-042-2/+75
|\| | |
| * | | backported macros necessary to create output modules with transaction supportRainer Gerhards2009-06-041-1/+71
| | | | | | | | | | | | | | | | | | | | | | | | this does not mean the v4 engine will support batches and output transactions, but I can now write plugins that will work equally well with v4 AND v5. I consider this useful during the rewrite of omfile.
| * | | backported some of the v5 testbenchRainer Gerhards2009-06-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this permits us to keep a persistent test environment between v4 and v5, most importantly using the same tools. As far as the actual tests are concerned, some had issues. I had no time to check if that was an issue with the test or an actual issue with the v3/4 engine. Will do that at some later stage.
* | | | added gzip header to output filesRainer Gerhards2009-06-032-2/+9
| | | | | | | | | | | | | | | | so they can now be processed with the "regular" gzip tools
* | | | first proof of concept on zipped file writerRainer Gerhards2009-06-035-0/+177
|/ / / | | | | | | | | | | | | | | | This DOES NOT work sufficiently well, I just wanted to verify that zip writing is possible and files are readable. Will be refined soon.
* | | strmsrv now supports KEEPALIVE socket optionRainer Gerhards2009-06-027-4/+82
| | |
* | | slightly extended strms_sess interfaceRainer Gerhards2009-06-022-1/+10
| | |
* | | added a generic network stream serverRainer Gerhards2009-06-026-0/+1438
| | | | | | | | | | | | (in addition to rather specific syslog tcp server)
* | | Merge branch 'beta'Rainer Gerhards2009-05-292-1/+2
|\| | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| * | Merge branch 'v3-stable' into betaRainer Gerhards2009-05-292-1/+2
| |\| | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| | * fixed a regression of yesterday's patchRainer Gerhards2009-05-292-1/+2
| | | | | | | | | | | | | | | ... I know I should not have done this to a stable branch... Thankfully nothing was yet released.
* | | Merge branch 'beta' into masterRainer Gerhards2009-05-281-0/+6
|\| | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| * | Merge branch 'v3-stable' into betaRainer Gerhards2009-05-282-0/+7
| |\| | | | | | | | | | | | | Conflicts: tests/Makefile.am
| | * small enhancement: config validation run now exits with code 1 if an error ↵Rainer Gerhards2009-05-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is detected. This change is considered important but small enough to apply it directly to the stable version. [But it is a border case, the change requires more code than I had hoped. Thus I have NOT tried to actually catch all cases, this is left for the current devel releases, if necessary]
| | * Fix compiler warningsMichael Biebl2009-05-121-0/+1
| | | | | | | | | | | | Include <string.h> for memcpy and strlen.
* | | greatly enhanced testbenchRainer Gerhards2009-05-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The imdiag module now can very effectively inject messages, which also frees us from uncertainties of tcp reception and processing. All shell script based tests have been modularized, what makes it far easier to create new tests. Also, the test bench now executes more reliable and much faster, because we can now rely on actual engine information where we previously did just a dumb sleep.