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
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
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
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
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
Rainer Gerhards
e9cf777ca4
Merge branch 'v6-stable' into beta
2012-10-19 09:33:22 +02:00
Rainer Gerhards
82d0b37dc8
Merge branch 'v6-stable' into v6-beta
2012-10-19 09:33:10 +02:00
Rainer Gerhards
16e3921905
Merge branch 'v5-stable' into v6-stable
...
Conflicts:
runtime/nsdpoll_ptcp.c
2012-10-19 09:32:58 +02:00
Rainer Gerhards
d36407c794
fix epoll-enabled code to use correct data member for pointers
2012-10-19 09:07:32 +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
Michael Biebl
c96bc325ac
build: Remove vestiges of the cust1 plugin
2012-10-18 12:58:04 +02:00
Michael Biebl
482f89ab72
build: Drop unused include path
2012-10-18 12:58:04 +02:00
Michael Biebl
d8142e2884
build: Drop unused CNF_LIBS variable
2012-10-18 12:58:04 +02:00
Michael Biebl
d9fe6affb3
build: Use pkg-config to check for libcurl
...
curl has shipped that file since 2004.
2012-10-18 12:58:03 +02:00
Michael Biebl
bff0023f7b
build: Use pkg-config to check for libuuid
...
e2fsprogs resp. util-linux(-ng) have shipped that file since at least
2009.
2012-10-18 12:58:03 +02:00
Michael Biebl
2f28799576
build: Don't call AC_SUBST for variables defined by PKG_CHECK_MODULES
...
Newer versions of pkg-config do that already. According to pkg-config
upstream this change was made around 2005, so it should be rather safe.
This change doesn't affect users building from dist tarballs anyway but
only if you are building from a Git checkout.
2012-10-18 12:58:03 +02:00
Rainer Gerhards
5d9b34eb36
doc: typo fix
2012-10-17 17:21:15 +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
Marius Tomaschewski
d4f9c384c2
imklog: use memmove instead of memcpy (solaris)
2012-10-17 15:04:43 +02:00
Marius Tomaschewski
51754401f7
imklog: use memmove to remove kernel timestamp
2012-10-17 14:47:27 +02:00
Marius Tomaschewski
49a5c0c3b9
imklog: skip leading spaces in kernel timestamp
2012-10-17 14:46:35 +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
Michael Biebl
dfb08d5fcc
systemd: Remove obsolete ExecStartPre command
...
With the introduction of the journal in systemd v38 [1], the
systemd-kmsg-syslogd.service service was removed. All major
distributions which ship systemd use v44 or later in their current
releases, so it seems safe to drop the ExecStartPre command.
[1] http://lists.freedesktop.org/archives/systemd-devel/2012-January/004188.html
2012-10-16 18:25:06 +02:00
Michael Biebl
c86761d912
systemd: Drop obsolete compatibility flag
...
In v6 [1], the compatibility mode has been removed and -c is a basically
a no-op. So just drop that obsolete command line flag.
[1] http://www.rsyslog.com/doc/v6compatibility.html
2012-10-16 18:25:00 +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
