Rainer Gerhards
b50d13a6a9
restored repeated message reduction processing
2009-06-23 14:50:03 +02:00
Rainer Gerhards
d798f5b66f
some more optimizations
...
- done malloc() instead of calloc() for msg_t, as we have large space
which needs not be initialized
- shrunk syslogTime structure in the hope to get better cache and
write performance (non-aligned data should not hurt much here)
2009-06-23 11:22:07 +02:00
Rainer Gerhards
ce5869f7c4
optimized processing of TAG message field
2009-06-22 18:52:30 +02:00
Rainer Gerhards
221dc8a322
some more optimizations of the msg_t object (minor)
2009-06-22 18:19:10 +02:00
Rainer Gerhards
8962c6b011
reduced memory footprint / "memory leak"
...
Testing has shown that at least the glibc malloc() subsystem returns
memory to the OS far too late in our case. So we need to help it a bit,
by calling malloc_trim(), which will tell the alloc subsystem
to consolidate and return to the OS.
2009-06-22 17:35:16 +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
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
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
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
aba90e8248
added capability to run multiple tcp listeners (on different ports)
...
Well, actually this and a lot of related things. I improved the
testbench so that the new capabilities are automatically tested and
also did some general cleanup. The current multiple tcp listener
solution will probably receive some further cleanup, too, but looks
quite OK so far. I also reviewed the way tcpsrv et all work, in
preparation of using this code for imdiag. I need to document the
findings, especially as the code is rather complicated "thanks" to
the combination of plain tcp and gssapi transport modes.
2009-05-22 17:06:52 +02:00
Rainer Gerhards
a5b4cb1681
Merge branch 'beta'
...
Conflicts:
ChangeLog
tcpsrv.c
tcpsrv.h
Note: we have a slight inconsistency, as interface version v4 was already
used for tcpsrv in this branch. We accept this inconsistency.
2009-04-09 13:44:52 +02:00
Rainer Gerhards
0cade5118f
Merge branch 'v3-stable' into beta
...
Conflicts:
ChangeLog
2009-04-09 13:41:38 +02:00
Rainer Gerhards
5e4fc93dd5
Merge branch 'v2-stable' into v3-stable
2009-04-09 12:28:08 +02:00
Rainer Gerhards
1cfa08749b
bugfix: solved potential memory leak in msg processing
...
could manifest itself in imtcp (loss of a few bytes for *each* received
message - but depended on config) -- this was newly introduced
2009-04-08 18:59:15 +02:00
Rainer Gerhards
3954f2e166
added new "csv" property replacer option
...
to enable simple creation of CSV-formatted outputs (format
from RFC4180 is used)
2009-04-02 12:48:07 +02:00
Rainer Gerhards
a2f547fdbf
Merge branch 'beta'
2009-01-30 13:53:37 +01:00
Rainer Gerhards
b54797da05
Merge branch 'v3-stable' into beta, conclude fix for race
...
Conflicts:
ChangeLog
runtime/msg.c
2009-01-30 13:52:49 +01:00
Rainer Gerhards
2cfaf5f86a
bugfix: inconsistent use of mutex/atomic operations could cause segfault
...
details are too many, for full analysis see blog post at:
http://blog.gerhards.net/2009/01/rsyslog-data-race-analysis.html
2009-01-30 13:49:41 +01:00
Rainer Gerhards
77b363fb4e
Merge branch 'debian_lenny' into v3-stable
2009-01-30 13:41:31 +01:00
Rainer Gerhards
82d7abc1f4
bugfix: invalid mutex access in msg.c
2009-01-30 13:41:12 +01:00
Rainer Gerhards
06f211d230
Merge branch 'drd-testing'
2009-01-29 12:05:39 +01:00
Rainer Gerhards
14d5cc7f55
fixed atomic operations
2009-01-29 11:58:26 +01:00
Rainer Gerhards
ead2c355e3
bugfix: unitialized mutex was used in msg.c:getPRI
...
This was subtle, because getPRI is called as part of the debugging code
(always executed) in syslogd.c:logmsg.
2009-01-26 22:30:55 +01:00
Rainer Gerhards
c9078c7220
Merge branch 'v3-stable' into beta
...
Conflicts:
ChangeLog
doc/manual.html
2008-11-11 12:58:53 +01:00
Rainer Gerhards
4cfbf894fd
enhance: regex nomatch option "ZERO" has been added
...
This allows to return the string 0 if a regular expression is
not found. This is probably useful for storing numerical values into
database columns.
2008-11-11 12:00:11 +01:00
Rainer Gerhards
c291d8baca
improved debug output for regular expressions inside property replacer
...
RE's seem to be a big trouble spot and I would like to have more
information inside the debug log. So I decided to add some additional
debug strings permanently.
2008-11-11 10:07:52 +01:00
Rainer Gerhards
02bb3c901d
consolidated time calls during msg object creation
...
...this improves performance and consistency and also fixes
a bug where subsecond time properties generated by imfile, imklog and
internal messages could be slightly inconsistent.
2008-10-02 15:52:24 +02:00
Rainer Gerhards
925bea7177
bugfix: segfault when main queue was in direct mode
2008-10-01 19:01:53 +02:00
Rainer Gerhards
47a2593ae4
atomic memory access calls re-enabled in msg.c
...
destructor not yet permitted because verification is
missing that a atomic opration is sufficient for the
job required
2008-09-23 14:41:02 +02:00
Rainer Gerhards
bc70a73019
bugfix: proper synchronization on message destruction
...
The code was potentially race, at least on systems where
a memory barrier was needed. Fix not fully tested yet.
2008-09-19 17:41:11 +02:00
Rainer Gerhards
262f61d869
added properties "inputname" and "$myhostname"
...
- added message property "inputname", which contains the name of the
input (module) that generated it. Presence is depending on suport in
each input module (else it is blank).
- added system property "$myhostname", which contains the name of the
local host as it knows itself.
2008-09-10 15:59:53 +02:00
Zhuang Yuyao
d65470842d
added new capability to property replacer.
...
Multiple immediately successive field delimiters are treated as
a single one.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2008-09-10 12:18:34 +02:00
Rainer Gerhards
d45a286f2d
Merge branch 'v3-stable' into beta
...
Conflicts:
doc/property_replacer.html
tools/syslogd.c
2008-07-18 14:51:49 +02:00
Rainer Gerhards
27d70409f7
bugfix: priority was incorrectly calculated on FreeBSD 7
...
because the LOG_MAKEPRI() C macro has a different meaning there (it
is just a simple addition of faciltity and severity). I have changed
this to use own, consistent, code for PRI calculation.
2008-07-14 15:59:55 +02:00
Rainer Gerhards
93fed4bd30
Merge branch 'beta' - important mutex bugfix
...
Conflicts:
ChangeLog
configure.ac
doc/Makefile.am
doc/manual.html
2008-07-14 11:19:56 +02:00
Rainer Gerhards
d451808236
reduced number of compile warnings in -pedantic gcc mode
2008-06-27 10:10:47 +02:00
Rainer Gerhards
cf51333f76
fixed a bug with the new property replacer option
...
there was a copy&paste error in the timereported
property - thanks to Elizabeth for reporting it
2008-06-07 11:01:13 +02:00
Rainer Gerhards
2687d0010c
added new property replacer option "time-subseconds"
...
enables to query just the subsecond part of a high-precision timestamp
2008-06-06 17:33:58 +02:00
Rainer Gerhards
eddaca33a8
enhanced property replacer to support multiple regex matches
2008-06-04 11:11:52 +02:00
Rainer Gerhards
6a815063f3
capability for replacement text in no match regex case added
...
implemented in property replacer: if a regular expression does not match,
it can now either return "**NO MATCH** (default, as before), a blank
property or the full original property text
2008-05-30 15:18:03 +02:00