Rainer Gerhards
76c4d6b951
$IMUXSockRateLimitInterval DEFAULT CHANGED, was 5, now 0
...
The new default turns off rate limiting. This was chosen as people
experienced problems with rate-limiting activated by default. Now it
needs an explicit opt-in by setting this parameter.
Thanks to Chris Gaffney for suggesting to make it opt-in; thanks to
many unnamed others who already had complained at the time Chris made
the suggestion ;-)
2012-01-16 17:58:57 +01:00
Rainer Gerhards
d0a83a1f7a
Merge branch 'v4-stable-tmp' into v5-devel-tmp
...
Conflicts:
dirty.h
tools/syslogd.c
2012-01-10 18:04:01 +01:00
Rainer Gerhards
545a80918b
Merge branch 'tmp' into v4-stable-tmp
...
Conflicts:
dirty.h
doc/rsyslog_conf_global.html
tools/syslogd.c
2012-01-10 17:18:11 +01:00
Tomas Heinrich
a2e69cffff
added $SpaceLFOnReceive config directive
...
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2012-01-10 17:14:16 +01:00
Rainer Gerhards
159abfbc37
Merge branch 'tmp' into v4-stable-tmp
2012-01-10 17:08:47 +01:00
Tomas Heinrich
e25dc05e91
added canned template for ultra-exact sysklogd file format
...
the point is that LF will be translated to SP
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2012-01-10 17:07:55 +01:00
Rainer Gerhards
e1e6ef71f4
finally cleaning up the syslog-ng rsyslog comparison
...
this page should be removed from the doc set over time -- it really
does not belong here.
2012-01-09 18:44:05 +01:00
Rainer Gerhards
cc0da38a4b
final prep for 6.2.0
2012-01-09 15:36:54 +01:00
Rainer Gerhards
7dfc7c709f
Merge branch 'beta'
...
Conflicts:
ChangeLog
doc/v6compatibility.html
2012-01-09 14:21:35 +01:00
Rainer Gerhards
e6e1ff65bc
removing $Begin, $End, $StrictScoping directives
...
v6.4 will provide the same functionality in a far better way.
So we do not want to clutter the code.
-------------------------
2012-01-09 14:17:40 +01:00
Rainer Gerhards
00d2ac3d71
Merge branch 'v5-devel'
...
Conflicts:
ChangeLog
action.c
plugins/imudp/imudp.c
2011-12-19 17:30:43 +01:00
Rainer Gerhards
6bcc1e371b
Merge branch 'v5-stable-newstats' into v5-devel
...
Conflicts:
ChangeLog
action.c
2011-12-19 11:20:59 +01:00
Rainer Gerhards
5fe837bf7d
added instrumentation
2011-12-19 11:16:07 +01:00
Rainer Gerhards
a1b752b32f
more work on queue statistics counter
2011-12-16 15:12:24 +01:00
Rainer Gerhards
b80b0672be
Merge branch 'v5-devel'
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imuxsock/imuxsock.c
runtime/modules.c
2011-12-16 12:51:12 +01:00
Rainer Gerhards
3d75ffa1af
Merge branch 'beta'
2011-12-16 11:05:41 +01:00
Rainer Gerhards
4f0ff38f1c
Merge branch 'v5-stable' into beta
2011-12-16 11:05:29 +01:00
Rainer Gerhards
db137ef8c1
Merge branch 'v4-stable' into v5-stable
2011-12-16 11:05:16 +01:00
Rainer Gerhards
21c2f630e9
added doc for omprog
2011-12-16 10:31:17 +01:00
Rainer Gerhards
f3ff6a6cd6
Merge branch 'beta'
2011-12-12 09:36:15 +01:00
Rainer Gerhards
d98ac49d24
Merge branch 'v5-stable' into beta
2011-12-01 11:30:25 +01:00
Rainer Gerhards
e53752e168
preparing for 5.9.4
2011-11-29 16:55:26 +01:00
Rainer Gerhards
54cee2ce69
imuxsock: added capability to "annotate" messages with "trusted information",
...
which contains some properties obtained from the system and as such
sure to not be faked. This is inspired by the similiar idea introduced
in systemd.
2011-11-29 12:36:36 +01:00
Rainer Gerhards
d34a25b78c
Merge branch 'v4-stable' into v5-stable
2011-11-03 10:13:44 +01:00
Rainer Gerhards
eae869a3a4
doc bugfix: typo in imgssapi doc
2011-11-03 10:13:11 +01:00
Rainer Gerhards
272f0a5b3d
Merge branch 'beta'
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/v6compatibility.html
2011-10-27 09:56:54 +02:00
Rainer Gerhards
e789097d32
Merge branch 'v5-stable' into beta
2011-10-25 15:00:09 +02:00
Rainer Gerhards
68ac2ae9bc
Merge branch 'v4-stable' into v5-stable
2011-10-25 14:59:55 +02:00
Rainer Gerhards
48e01bf415
doc: imfile: clarified that empty lines are not processed
2011-10-25 14:59:29 +02:00
Rainer Gerhards
e770177555
Merge branch 'v5-devel'
...
Conflicts:
ChangeLog
2011-10-21 15:03:53 +02:00
Rainer Gerhards
12102199c4
Merge branch 'v5-stable' into v5-devel
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
2011-10-21 14:42:32 +02:00
Rainer Gerhards
5d67d98c35
preparing for 5.8.6 release
2011-10-21 14:23:13 +02:00
Rainer Gerhards
bb293ca32a
Merge branch 'v5-stable' into beta
...
Conflicts:
doc/rsyslog_recording_pri.html
2011-10-21 10:47:31 +02:00
Rainer Gerhards
43d9709847
bugfix (kind of): removed numerical part from pri-text
...
see v6 compatibility document for reasons
2011-10-21 10:44:40 +02:00
Rainer Gerhards
599a493cac
Merge branch 'v4-stable' into v5-stable
2011-10-20 12:08:38 +02:00
Rainer Gerhards
eb87d6f095
doc bugfix: pri-text neees to be fixed in an article as well
2011-10-20 12:08:03 +02:00
Rainer Gerhards
b9ca8e0b1e
doc bug: property pri-text was incorrectly described
2011-10-20 12:05:57 +02:00
Rainer Gerhards
16f06168e1
Merge branch 'v5-stable' into v5-devel
...
Conflicts:
ChangeLog
2011-10-17 15:26:11 +02:00
Rainer Gerhards
359ddad3c5
Merge branch 'beta'
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
2011-10-17 14:53:22 +02:00
Rainer Gerhards
943a2070a6
Merge branch 'v5-stable' into beta
2011-10-17 14:48:29 +02:00
Rainer Gerhards
f84c8c4e96
Merge branch 'v4-stable' into v5-stable
2011-10-17 14:44:13 +02:00
Rainer Gerhards
9a0548d290
doc: clarified that imklog does not support Solaris
2011-10-17 14:43:43 +02:00
Rainer Gerhards
ceb336f039
preparing for 6.3.6 release
2011-09-19 12:47:21 +02:00
Rainer Gerhards
c55997638f
added $InputRELPServerBindRuleset directive to specify rulesets for RELP
2011-09-08 15:05:04 +02:00
Rainer Gerhards
11ee5cbdfb
Merge branch 'v4-beta' into v4-stable, prep for 4.8.0
...
There are no changes compared to 4.7.5, just a re-release with the new
version number as new v4-stable. The most important new feature is Solaris
support.
Conflicts:
configure.ac
doc/manual.html
2011-09-07 15:38:57 +02:00
Rainer Gerhards
dd55f8311f
preparing for 6.3.5 release
2011-08-31 13:07:06 +02:00
Rainer Gerhards
0509f14041
preparing for 6.1.12 release
2011-08-31 13:00:18 +02:00
Rainer Gerhards
a808123d37
preparing for 5.9.3 release
2011-08-31 12:32:28 +02:00
Rainer Gerhards
156d3f64e7
preparing for 4.7.5 release
2011-08-31 12:27:32 +02:00
Rainer Gerhards
47f378fb87
preparing for 5.8.5 release
2011-08-31 12:22:05 +02:00
