5357 Commits

Author SHA1 Message Date
Rainer Gerhards
3c71347aa6 prepare for 7.3.3 release v7.3.3 2012-11-07 12:14:00 +01:00
Rainer Gerhards
a31321b80d bugfix: property tTIMESTAMP was incorrectly restored
in msg deserializer
2012-11-07 11:04:51 +01:00
Rainer Gerhards
479657a045 cleanup: remove no longer needed function 2012-11-06 18:18:16 +01:00
Rainer Gerhards
94f6326237 queue: reduce CPU load for deserializing message properties
Linear runtime due to message order. Was quadratic before. However, not
a big overall improvement.
2012-11-06 17:48:35 +01:00
Rainer Gerhards
28047567a2 doc: improve ommongodb doc 2012-11-06 12:08:09 +01:00
Rainer Gerhards
704bb9fc21 queue: mini-improvement in deserializer (stage work) 2012-11-05 17:04:30 +01:00
Rainer Gerhards
6a61b91815 very minimal improvement in reconstructing persisted queue entries 2012-11-05 13:02:30 +01:00
Rainer Gerhards
4c92985ed2 improve debug logging a bit 2012-11-05 13:02:06 +01:00
Rainer Gerhards
557f20f841 bugfix: dynafile zip files could be corrupted
This could happen if a dynafile was destructed before the first write.
In practice, this could happen if few lines were written to a file and
it then became evicted from the dynafile cache. This would probably
look very random, because it depended on the timing in regard to
message volume and dynafile cache size.
2012-11-05 13:01:25 +01:00
Rainer Gerhards
9ab1503180 queue: handle unknown queue type in debug output
note: can not happen, but...
2012-11-03 17:18:11 +01:00
Rainer Gerhards
89667762cf Merge branch 'master-newqueue' 2012-11-03 17:16:10 +01:00
Rainer Gerhards
5a64366922 queue: remove time() calls from msg deserialization 2012-11-03 17:07:22 +01:00
Rainer Gerhards
c28d92259b queue: use specific deserializer for msg object
spares lengthy table lookups
2012-11-03 13:27:27 +01:00
Rainer Gerhards
f88d4f76f6 queue: remove unnecessary (obj_t*) redirection from msg ptrs 2012-11-03 12:51:19 +01:00
Rainer Gerhards
c7ac716085 cosmetic: remove compiler warning 2012-11-03 12:49:15 +01:00
Rainer Gerhards
c55e0a5a06 queue: change generic msg ptr (pUsr) to be of msg_t type 2012-11-03 12:32:50 +01:00
Rainer Gerhards
feddb2cc8f queue: change gerenic queue pUsr ptr to be action_t
this was always action_t, but the initial design was more generic. We are
making it specific now in order to gain better performance (after all, we
did not need the generic engine in the past 8 years...)
2012-11-03 11:40:13 +01:00
Rainer Gerhards
8c32e9d36f Merge branch 'v7-stable' 2012-11-02 19:05:27 +01:00
Rainer Gerhards
a3742bdffd bugfix: potential abort of imtcp on rsyslogd shutdown 2012-11-02 19:05:05 +01:00
Rainer Gerhards
40fffde2b6 generate disk .qi file once at queue construction
... instead of each time a file write happens. In some situations
(very frequent sync), this can probably be a big performane win.
2012-11-02 18:55:53 +01:00
oxpa
ec314dabec bugfix: potential segfault when re_match() function was used
Thanks to oxpa for the patch.
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=371
2012-11-02 17:00:58 +01:00
Rainer Gerhards
ceb155075b Merge branch 'v7-stable' 2012-11-01 19:08:35 +01:00
Rainer Gerhards
0bde71bdb7 Merge branch 'v6-stable' into v7-stable 2012-11-01 19:07:56 +01:00
Rainer Gerhards
8995034e5a doc: add recent patch (API) to ChangeLog 2012-11-01 19:07:08 +01:00
Rainer Gerhards
206908e288 bugfix: invalid rsyslog-internal macro API use
This had no bad effect, because the macro did the same as the one
that should have been used.
2012-11-01 19:05:49 +01:00
Rainer Gerhards
d18b0a62f8 Merge branch 'v7-stable' 2012-11-01 19:04:37 +01:00
Rainer Gerhards
d5c033ac2b Merge branch 'v6-stable' into v7-stable 2012-11-01 19:04:19 +01:00
Rainer Gerhards
b6e41c0d9e bugfix: misaddressing of $mmnormalizeuserawmsg parameter
On many platforms, this has no effect at all. At some, it may cause
a segfault. The problem occurs only during config phase, no segfault
happens when rsyslog has fully started.
2012-11-01 19:03:52 +01:00
Rainer Gerhards
581a11a103 doc: add module doc for mmjsonparse 2012-11-01 18:22:32 +01:00
Rainer Gerhards
dca7537f94 typo fix 2012-11-01 18:14:13 +01:00
Rainer Gerhards
19354af62c mmnormalize: support for v6+ config interface added 2012-11-01 18:12:26 +01:00
Rainer Gerhards
db6db9ce0d mmjsonparse: support for v6+ config interface added 2012-11-01 17:22:23 +01:00
Rainer Gerhards
e5ef73eb25 bugfix: invalid rsyslog-internal macro API use
This had no bad effect, because the macro did the same as the one
that should have been used.
2012-11-01 17:05:07 +01:00
Martin Nilsson
2492552dc8 bugfix: imzmq3 segfault with PULL subscription 2012-10-30 16:30:18 +01:00
Rainer Gerhards
20c57a6d70 prepare for 7.3.2 release v7.3.2 2012-10-30 16:05:55 +01:00
Rainer Gerhards
e711dc6e6b Merge branch 'master-ratelimit' 2012-10-30 14:59:01 +01:00
Rainer Gerhards
7faeff73dd Merge branch 'v7-stable'
Conflicts:
	configure.ac
	doc/manual.html
2012-10-30 13:12:39 +01:00
Rainer Gerhards
ad1b93df8a bugfix: omfwd did not properly support "template" parameter
We also added a testbench test to check for this in the future. That
in turn required new testbench tools.
2012-10-30 13:06:20 +01:00
Rainer Gerhards
e1055b6a11 testbench: complex1.sh testcase failed on slower machines
... due to too small timeout for enqueue processing --> messages got lost
2012-10-29 17:44:35 +01:00
Rainer Gerhards
c7a4fbcc0a prepare for 7.2.1 release v7.2.1 2012-10-29 15:50:06 +01:00
Rainer Gerhards
9f74e3521f remove legacy API parseAndSubmitMessage() from imrelp 2012-10-29 12:08:43 +01:00
Rainer Gerhards
1c8fa9783e testbench: add test for ruleset() and call statements 2012-10-29 12:02:07 +01:00
Rainer Gerhards
b11c85aac8 move cJSON to omelasticsearch
the rsyslog runtime itself now uses json-c, but omelasticsearch
currently depends on cJSON. We will change this, but not yet. Let's
merge as is and see that it works well ;)
2012-10-29 11:49:07 +01:00
Rainer Gerhards
e6424d4e52 Merge branch 'beta-jsonrt' into master-es
Conflicts:
	ChangeLog
	runtime/rsyslog.h
2012-10-29 10:25:06 +01:00
Rainer Gerhards
6bc4613674 Merge branch 'v7-stable' 2012-10-29 10:16:49 +01:00
Rainer Gerhards
d1d0b27fc4 bugfix: ruleset()-object did only support a single statement 2012-10-27 15:06:29 +02:00
Rainer Gerhards
fac3c09f04 Merge branch 'v7-stable' 2012-10-27 14:50:06 +02:00
Rainer Gerhards
0d762b7509 add -D rsyslogd option to enable config parser debug mode 2012-10-27 14:41:56 +02:00
Rainer Gerhards
86faa4ece6 Improve syntax error messages by outputting the error token 2012-10-27 14:13:15 +02:00
Rainer Gerhards
2ff43aa8c4 bugfix: build problems on some platforms 2012-10-26 18:24:39 +02:00