2514 Commits

Author SHA1 Message Date
Rainer Gerhards
3abf567d2b optimized template string generation 2009-06-19 16:07:17 +02:00
Rainer Gerhards
953d015f44 switched default to keep in line with traditional syslogd behaviour 2009-06-19 14:25:27 +02:00
Rainer Gerhards
cbad28915a optimized action.c a bit 2009-06-19 12:39:06 +02:00
Rainer Gerhards
7b3dad877e removed pthread_testcancel() as it is no longer necessary
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).
2009-06-19 12:10:38 +02:00
Rainer Gerhards
7a695d1714 removed uniprocessor optimization
... 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).
2009-06-19 12:03:56 +02:00
Rainer Gerhards
dd53709083 typo fix 2009-06-19 11:58:30 +02:00
Rainer Gerhards
11cb1e008b some cleanup 2009-06-19 11:45:21 +02:00
Rainer Gerhards
77c992e215 fully optimized datetime module and enhanced test suite
tests for the various timestamp formats have been added
2009-06-19 11:30:57 +02:00
Rainer Gerhards
dc603a3dbf optimized rfc3339 timestamp string generation 2009-06-19 09:58:33 +02:00
Rainer Gerhards
f33dd51c80 fixed abort condition with oversize tags
this was a regression I introduced this afternoon
2009-06-18 17:48:11 +02:00
Rainer Gerhards
2de4964aff optimized handling of MSG part in msg object
WARNING: currently, message repeation processing is disabled, must
be reenabled (but prefer to do some other tests first)
2009-06-18 16:51:40 +02:00
Rainer Gerhards
df9012f755 slight optimization of template generation 2009-06-18 16:20:06 +02:00
Rainer Gerhards
f18c0ffb9a some optimization in the property replacer 2009-06-18 15:57:16 +02:00
Rainer Gerhards
2f86678c57 optimized TAG handling in msg object 2009-06-18 14:30:21 +02:00
Rainer Gerhards
8628312396 cleaned up/optimized raw message handling in msg object 2009-06-18 13:22:21 +02:00
Rainer Gerhards
f529e8b2c3 Merge branch 'master' into newmsg
Conflicts:
	tools/omfile.c
2009-06-18 11:14:14 +02:00
Rainer Gerhards
a6ed4b59cc Merge branch 'beta' 2009-06-18 11:11:59 +02:00
Rainer Gerhards
17133f2cd1 Merge branch 'v3-stable' into beta 2009-06-18 11:11:07 +02:00
Rainer Gerhards
bca66bc139 some minor bugfixes
- 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
2009-06-18 11:10:28 +02:00
Rainer Gerhards
d2d54013ae going forward in moving string-handling functions to new interface... 2009-06-17 15:22:13 +02:00
Rainer Gerhards
34b60b389e some more optimization in msg object string handling 2009-06-17 13:33:57 +02:00
Rainer Gerhards
56e462610d further optimized message object
pri, facility and severity string generation simplified
2009-06-17 12:56:58 +02:00
Rainer Gerhards
1e30f67584 added basic plumbing to support message properties separate from message
will fill this with live somewhat later, noticed I need to do some stage work
first (at least this is useful).
2009-06-16 19:32:53 +02:00
Rainer Gerhards
8a37736287 some cleanup 2009-06-16 19:18:41 +02:00
Rainer Gerhards
c4e18c5bab implemented first version of multi-enqueue support, queue side 2009-06-16 15:43:22 +02:00
Rainer Gerhards
6f0db63e9b milestone: input-side multiSubmit capability
... commit before I try to touch the queue side ;)
2009-06-16 15:13:47 +02:00
Rainer Gerhards
aef1a38fe8 fixing problems that occurred during the last merge 2009-06-16 13:28:18 +02:00
Rainer Gerhards
f45dfe93af minor cleanup 2009-06-16 13:00:04 +02:00
Rainer Gerhards
98348ae03d Merge branch 'master' into omfile
Conflicts:
	ChangeLog
	runtime/msg.h
	tcps_sess.c
	tcpsrv.c
	tools/syslogd.c
2009-06-16 12:59:55 +02:00
Rainer Gerhards
74b2b24f50 removed long-obsoleted property UxTradMsg
... as well as some cleanup (some commented-out code is left to
support UxTradMsg again is someone really complains ;)).
2009-06-16 12:31:27 +02:00
Rainer Gerhards
f7579e68a6 done various optimizations to the stringbuf and its users 2009-06-16 11:36:05 +02:00
Rainer Gerhards
015d17ca70 some performance optimizations
- saved gettimeofday() calls in imtcp (and increased reception buffer)
- somewhat optimized stringbuf.c
- some other optimizations
2009-06-16 08:46:45 +02:00
Rainer Gerhards
4af40abc0a cleaned up small nit 2009-06-16 07:15:48 +02:00
Rainer Gerhards
16ecb90c3a omfile buffers are now synchronized after inactivity
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.
2009-06-15 13:44:51 +02:00
Rainer Gerhards
7f78b2ef65 removed forgotten debug message 2009-06-15 08:13:41 +02:00
Rainer Gerhards
ff6232d2be bugfix: error messages were not emitted to stderr in forked mode
stderr and stdo are now kept open across fork()
2009-06-15 08:12:14 +02:00
Rainer Gerhards
1f874c2208 fixed small bug in testbench 2009-06-12 17:46:16 +02:00
Rainer Gerhards
057c9b11fc fixed a regression from past commit & more performance enhancement
a larger buffer is a cheap, yet useful, enhancement... ;)
2009-06-12 16:30:39 +02:00
Rainer Gerhards
b5ccdf0672 performance-enhanced imtcp
...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.
2009-06-12 15:59:50 +02:00
Rainer Gerhards
ca0ddc30a3 completed multi-ruleset core support
... as well as added multi-ruleset support for imtcp
2009-06-12 15:31:08 +02:00
Rainer Gerhards
21dafea3ee implemented $OMFileFlushOnTXEnd directive
plus some cleanup...
2009-06-12 12:18:17 +02:00
Rainer Gerhards
e3d9843c85 re-enabled pipe, tty and console in omfile
... 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.
2009-06-12 11:47:00 +02:00
Rainer Gerhards
1af948107e fixed abort when emergency configuration was activated
this regression was introduced last friday, so this is *NOT* present
in any released version.
2009-06-12 10:14:45 +02:00
Rainer Gerhards
7f7e5ef75a improved config error messages
now contain a copy of the config line that (most likely) caused the error
2009-06-12 09:57:50 +02:00
Rainer Gerhards
0917edf26d re-enabled outchannel functionality 2009-06-12 09:47:44 +02:00
Rainer Gerhards
1c8fe77b78 added $Ruleset config command
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.
2009-06-10 19:03:38 +02:00
Rainer Gerhards
6141845f75 re-enabled queue disk fsync test
... 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.
2009-06-10 18:24:46 +02:00
Rainer Gerhards
1dbdee7c77 fixed a small memory leak...
and another problem, both introduced today. Also did some general cleanup.
2009-06-10 18:05:24 +02:00
Rainer Gerhards
0290be816e fixed small nit in build system 2009-06-10 16:55:00 +02:00
Rainer Gerhards
6f4e3c4e4c restructered code in perparation for multiple rule set support
... 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.
2009-06-10 16:49:14 +02:00