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
Rainer Gerhards
20c57a6d70
prepare for 7.3.2 release
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
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
589744bc57
Merge branch 'v6-stable' into v7-stable
2012-10-25 18:31:32 +02:00
Michael Biebl
02bc178cc2
doc: fix html formatting
2012-10-25 18:31:08 +02:00
Rainer Gerhards
c18c7a0dc6
nit: correct invalid error code
2012-10-24 17:58:09 +02:00
Rainer Gerhards
ffe496e2c2
Merge branch 'master' into master-ratelimit
...
Conflicts:
doc/v7compatibility.html
2012-10-24 17:58:03 +02:00
Rainer Gerhards
205114176d
Merge branch 'v7-stable'
2012-10-24 14:45:01 +02:00
Rainer Gerhards
bf1eef67dd
cleanup
2012-10-24 14:44:45 +02:00
Rainer Gerhards
c72a43d280
make rsyslog core suspened actions after 10 failures in a row
...
This was former the case after 1,000 failures and could cause rsyslog
to be spammed/ressou
2012-10-24 13:00:38 +02:00
Rainer Gerhards
d579eacd44
ommongodb rate-limits error messages to prevent spamming the syslog
...
closes (for v7.2): http://bugzilla.adiscon.com/show_bug.cgi?id=366
2012-10-24 12:38:34 +02:00
Rainer Gerhards
99d6dc01d2
rate-limit rsyslog internal messages
...
a special ratelimiter is used; it's linux-type ratelimit settings
are currently hardcoded
2012-10-23 17:12:09 +02:00
Rainer Gerhards
7fb43edd3b
imuxsock: use a default ratelimiter if none else applies
2012-10-23 15:40:23 +02:00
Rainer Gerhards
fa9cb9f9e6
Merge branch 'tmp-ratelimit' into master-ratelimit
2012-10-23 15:16:32 +02:00
Rainer Gerhards
4c7578de4a
nit: valgrind-testaid was accidentely enabled in testbench
2012-10-23 14:16:30 +02:00
Rainer Gerhards
04ccff727d
Merge branch 'master' into master-ratelimit
...
Conflicts:
ChangeLog
2012-10-23 11:24:25 +02:00
Rainer Gerhards
3d41da36b8
remove "last message repeated n times" from rsyslog output part
2012-10-23 11:22:56 +02:00
Rainer Gerhards
1c4074259a
Merge branch 'v7-stable'
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
2012-10-23 09:41:00 +02:00
Rainer Gerhards
2a4c68954b
bugfix: segfault on startup when modules using MSG_PASSING mode are used
2012-10-23 09:39:56 +02:00
Rainer Gerhards
be0a6eb458
Merge branch 'v6-stable' into v7-stable
...
Conflicts:
configure.ac
doc/manual.html
template.c
2012-10-22 12:43:19 +02:00
Rainer Gerhards
6bfc397b09
preparing for 6.6.0
2012-10-22 12:20:18 +02:00
Rainer Gerhards
163acd9d9f
Merge branch 'v6-beta' into v6-stable
2012-10-22 11:41:23 +02:00
Rainer Gerhards
95fefbc12a
prepare for 7.20 stable release & minor things
...
The most important real code chane is the initialization of the
epoll control set. This should just be cosmetic (valgrind warnings),
as all data we actually use already was properly initialized.
2012-10-22 11:21:01 +02:00
Rainer Gerhards
ede5d1a121
testbench: -c option no longer exists
2012-10-22 10:48:41 +02:00
Rainer Gerhards
041f1fe09f
Merge branch 'beta-newgrammar'
...
Conflicts:
ChangeLog
2012-10-22 10:29:51 +02:00
Rainer Gerhards
d82327c954
re-enable deprecated warings for omdiscard/omruleset
...
merge for action list functionality will follow soon
2012-10-22 10:27:07 +02:00
Rainer Gerhards
b1635a867e
Merge branch 'beta'
2012-10-22 10:22:49 +02:00
Rainer Gerhards
3d0122be52
disable deprecated warnings in omdiscard/omruleset
...
... because action-like statements in action lists are not supported
in 7.1. This will be available in 7.3, but it is too late to do this in
7.1. So we disable the warnings and re-enable them in 7.3. Functionality-
wise, this is no problem at all as the legacy constructs are still
fully supported.
Thanks to forum user "canadaboy" for mentioning this problem.
2012-10-22 10:19:54 +02:00
Rainer Gerhards
316ad4e4c9
permit action-like statements (stop, call, ...) in action lists
2012-10-22 10:16:42 +02:00
Rainer Gerhards
9fb39ee798
Merge branch 'beta' into master-ratelimit
2012-10-22 09:27:31 +02:00
Rainer Gerhards
be7bd9b471
doc: remove BSD blocks from rsyslog.conf manpage
...
Thanks to Michael Biebl for mentioning this.
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=364
2012-10-22 09:22:55 +02:00
Rainer Gerhards
ff9ad0de55
Merge branch 'v6-stable' into beta
2012-10-22 09:15:41 +02:00
Rainer Gerhards
bee73d2d93
Merge branch 'v5-stable' into v6-stable
2012-10-22 09:12:06 +02:00
Rainer Gerhards
6569ae456b
doc: v3 compatibility doc lists invalid config directive
...
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=365
2012-10-22 09:11:30 +02:00
