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
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
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
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
a328d6bd39
doc: add imported bugfix to ChangeLog
...
plus some cleanup
2012-10-19 08:11:45 +02:00
Rainer Gerhards
f2e6477248
Merge branch 'v6-stable' into beta
2012-10-19 08:10:24 +02:00
Rainer Gerhards
b7f1b3265c
doc: add imported bugfix to ChangeLog
2012-10-19 08:09:42 +02:00
Rainer Gerhards
67598c226c
Merge branch 'v6-stable' into v6-beta
2012-10-19 08:09:11 +02:00
Rainer Gerhards
d4690ae053
bugfix: imuxsock did not properly honor $LocalHostIPIF
2012-10-19 08:08:46 +02:00
Rainer Gerhards
9a9c88a31a
preparing for 7.1.12 release
2012-10-18 14:34:54 +02:00
Rainer Gerhards
d3bb17372e
doc: add (v5-imported) imklog bugfix to ChangeLog
2012-10-17 16:57:11 +02:00
Rainer Gerhards
a21fe156df
Merge branch 'v6-stable' into beta
2012-10-17 16:56:12 +02:00
Rainer Gerhards
e544df3f39
Merge branch 'v6-stable' into v6-beta
2012-10-17 16:55:57 +02:00
Rainer Gerhards
0a3c0e2f4e
doc: reflect recent (v5-imported) fix in ChangeLog
2012-10-17 16:54:25 +02:00
Rainer Gerhards
db21912aa8
Merge branch 'v5-stable' into v6-stable
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
2012-10-17 16:51:59 +02:00
Rainer Gerhards
1e4ca69052
preparing for 5.10.1
2012-10-17 16:48:50 +02:00
Rainer Gerhards
75079d9519
Merge branch 'v6-stable' into beta
...
Conflicts:
rsyslog.service.in
2012-10-16 18:59:53 +02:00
Rainer Gerhards
bdc609639e
cleanup: removed remains of -c option (compatibility mode)
...
both from code & doc and emitted warning message if still used
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=361
Thanks to Michael Biebl for reporting & suggestions
2012-10-16 18:58:11 +02:00
Rainer Gerhards
c63fe7befc
doc: mention recent patches in ChangeLog
2012-10-16 18:27:44 +02:00
Rainer Gerhards
9cfb0aee7d
prepare for version 7.1.11
2012-10-16 15:45:21 +02:00
Rainer Gerhards
f3817aa885
Merge branch 'v6-stable' into beta
2012-10-16 15:21:56 +02:00
Rainer Gerhards
865772828d
Merge branch 'v6-stable' into v6-beta
2012-10-16 15:21:34 +02:00
Rainer Gerhards
3946d0f8df
Merge branch 'v5-stable' into v6-stable
...
Conflicts:
plugins/imuxsock/imuxsock.c
2012-10-16 15:21:08 +02:00
Rainer Gerhards
a0c9fcfc77
doc: fix minor small but important typo in ChangeLog
2012-10-16 15:19:49 +02:00
Rainer Gerhards
6ed28016ca
bugfix: imuxsock truncated head of received message
...
This happened only under some circumstances. Thanks to Marius
Tomaschwesky, Florian Piekert and Milan Bartos for their help in
solving this issue.
Note that Milan sent a patch, which solved the problem under some
conditions (can be found somewhat earlier in git history). However,
it did not handle the original root cause, and so did not fix the
problem always. The main reason was that the date parser modifies
the provided lenghts. That part of the API was not properly
used by the caller (who decremented the length once more).
2012-10-16 15:01:16 +02:00
Rainer Gerhards
f72faa803e
Merge branch 'v6-stable' into beta
...
Conflicts:
plugins/mmjsonparse/mmjsonparse.c
2012-10-11 18:31:31 +02:00
Rainer Gerhards
c94345aa36
Merge branch 'v6-stable' into v6-beta
2012-10-11 18:22:25 +02:00
Rainer Gerhards
b8916d5cf1
change lumberjack cookie to "@cee" from "@cee "
...
CEE originally specified the cookie with SP, whereas other lumberjack
tools used it without space. In order to keep interop with lumberjack,
we now use the cookie without space as well. I hope this can be changed
in CEE as well when it is released at a later time.
Thanks to Miloslav Trmač for pointing this out and a similiar v7 patch.
2012-10-11 18:21:57 +02:00
Rainer Gerhards
17c15234a3
doc: add last patch to ChangeLog
2012-10-11 18:12:46 +02:00
Rainer Gerhards
2ae9e456db
add deprecated note to discard action
2012-10-11 15:36:55 +02:00
Rainer Gerhards
a208fcfc70
added deprecated note to omruleset
2012-10-11 15:27:27 +02:00
Rainer Gerhards
9fa59604e9
bugfixes in regards to action()
...
- bugfix: small memory leak when processing action() statements
- bugfix: unknown action() parameters were not reported
2012-10-11 12:22:49 +02:00
Rainer Gerhards
d91e8c31a1
bugfix: some config processing warning messages were treated as errors
2012-10-11 12:14:55 +02:00
Rainer Gerhards
92c185ccfa
preparing for 6.5.1 release
2012-10-11 10:56:01 +02:00
Rainer Gerhards
5114dc9fa2
mention recent changes in ChangeLog
2012-10-11 09:39:14 +02:00
Rainer Gerhards
1cddc1c360
prepare for 7.1.9 release
2012-10-09 15:38:37 +02:00
Rainer Gerhards
431932d8d6
bugfix: in (non)equal comparisons the position of arrays influenced result
...
This behaviour is OK for "contains"-type of comparisons (which have quite
different semantics), but not for == and <>, which shall be commutative.
This has been fixed now, so there is no difference any longer if the
constant string array is the left or right hand operand. We solved this
via the optimizer, as it keeps the actual script execution code small.
2012-10-09 15:24:04 +02:00
Rainer Gerhards
74efc39564
Merge branch 'v6-stable' into beta
...
Conflicts:
plugins/cust1/Makefile.am
2012-10-04 18:45:11 +02:00
Rainer Gerhards
91613812af
Merge branch 'v6-stable' into v6-devel
2012-10-04 18:44:34 +02:00
Rainer Gerhards
76c80165e9
Merge branch 'v5-stable' into v6-stable
2012-10-04 18:44:14 +02:00
Rainer Gerhards
80466e20d1
remove cust1 dummy plugin from build system
...
Thanks to Michael Biebl for identifying this as the culprit for
several build-related issues. The plugin is a placeholder, and was
not used for quite some while. It is definitely not worth the effort
to keep it along. If needed, can be quickly created.
2012-10-04 18:42:52 +02:00
Rainer Gerhards
1b6ba3cfcb
doc: add missing files to distribution tarball
...
Thanks to Michael Biebl for alerting me of the problem.
2012-10-04 08:04:56 +02:00
Rainer Gerhards
83de403d50
Merge branch 'v6-stable' into beta
2012-10-04 07:48:27 +02:00
Rainer Gerhards
c8cf7313a1
Merge branch 'v6-stable' into v6-devel
2012-10-04 07:47:39 +02:00
Rainer Gerhards
2b75ccbe54
bugfix: comments inside objects (e.g. action()) were not properly handled
2012-10-04 07:34:13 +02:00
Rainer Gerhards
df90450d96
prepare for 7.1.8 release
2012-10-02 17:59:59 +02:00
Rainer Gerhards
7293018858
add "parser" parameter to ruleset(), so that parser chain can be configured
2012-10-02 17:25:32 +02:00
