7415 Commits

Author SHA1 Message Date
Rainer Gerhards
ff01bb6e38 janitor omfile: add impstats support for close timeouts
also some minor cleanup at other spots
2014-05-16 18:54:31 +02:00
Rainer Gerhards
83c32e8a6a janitor: cleanup on exit 2014-05-16 14:32:49 +02:00
Rainer Gerhards
fcf8e953b0 janitor: base functionality given for omfile 2014-05-16 14:22:20 +02:00
Rainer Gerhards
394d54987d janitor: add base plumbing 2014-05-15 18:36:40 +02:00
Rainer Gerhards
3805ff1712 janitor: add skeleton 2014-05-15 18:20:02 +02:00
Rainer Gerhards
1c375b2e6a improve debug output for ReduceRepeatMsgs 2014-05-06 09:36:15 +02:00
Rainer Gerhards
4f723bde4e Merge branch 'v8-stable' 2014-05-05 12:34:04 +02:00
Rainer Gerhards
e180d359c9 Merge branch 'v7-stable' into v8-stable 2014-05-05 12:33:56 +02:00
Rainer Gerhards
ce9b272317 imdiag: clarify state
see also: https://github.com/rsyslog/rsyslog/issues/71
2014-05-05 12:32:52 +02:00
Rainer Gerhards
851a32ff9b Merge branch 'v8-stable' 2014-05-05 12:21:26 +02:00
Rainer Gerhards
cf9ed51a14 Merge branch 'v7-stable' into v8-stable
Conflicts:
	configure.ac
2014-05-05 12:21:17 +02:00
Rainer Gerhards
9890a4bda4 Merge branch 'backport_issue_52' of https://github.com/Whissi/rsyslog into v7-stable
Conflicts:
	configure.ac
2014-05-05 12:20:41 +02:00
Rainer Gerhards
bb01a87ef1 maintain ChangeLog 2014-05-05 08:40:18 +02:00
Rainer Gerhards
7617106264 Merge branch 'v8-stable' 2014-05-05 08:39:36 +02:00
Rainer Gerhards
be703ebcfd Merge branch 'v7-stable' into v8-stable 2014-05-05 08:39:21 +02:00
Rainer Gerhards
1031f7b079 removed obsolete --disable-fsstnd configure option
Thanks to Thomas D. for alerting us.
Closes: https://github.com/rsyslog/rsyslog/issues/72
2014-05-05 08:38:36 +02:00
Thomas D
ac429cf3fd Backport 50c2f40712bab91e4bad1b2aa14c8e9ac1d2dc0a (issue #52) for the v7-stable branch. 2014-05-03 15:38:44 +02:00
Rainer Gerhards
ff8ae2f3dd prepare for 8.3.2 release v8.3.2 2014-05-02 10:45:58 +02:00
Rainer Gerhards
fc3c2bdcfb bugfix: mmexternal remove framing char before processing JSON reply
This did not have any real bad effects, but caused unnecessary
processing, as empty replies were not properly detected. Otherwise,
the bug was not noticible from the user's PoV.
2014-05-01 11:39:22 +02:00
Rainer Gerhards
e7bfdbea5c bugfix: mmexternal segfault due to invalid free in non-json input mode
closes: https://github.com/rsyslog/rsyslog/issues/70
2014-05-01 11:33:28 +02:00
Rainer Gerhards
5ff5a16718 bugfix: mmexternal segfault when external plugin sent invalid reply
... or no reply at all. This happened if the reply was imporper JSON.
Now, we emit an error message in those cases.
see also: https://github.com/rsyslog/rsyslog/issues/69
2014-04-30 13:01:31 +02:00
Rainer Gerhards
73f4234398 imjournal: avoid void* arithmetic
this worked, but could lead to unpredictable results on some platforms
(at least in theory)
2014-04-30 12:06:12 +02:00
Rainer Gerhards
196c6c8e74 undo interface changes to getTime* functions
I originally thought that I would need to do dynamic memory
alloc and extended the interface to support this. Fortunatley,
this could be avoided, and so I undo that change now.
2014-04-30 12:01:01 +02:00
Rainer Gerhards
7cb672740b clean up compiler warnings
not earlier noticed due to CFLAGS... :-(
2014-04-30 11:57:23 +02:00
Rainer Gerhards
e3bcf3f0e8 add date-wday template option to complete date-related set
Was not requested, but makes sense to support it.
See also: https://github.com/rsyslog/rsyslog/issues/65
2014-04-30 11:47:47 +02:00
Rainer Gerhards
be762d0813 maintain ChangeLog 2014-04-30 11:23:21 +02:00
Rainer Gerhards
0ac1ce59dd add remaining template options for date extraction
see also: https://github.com/rsyslog/rsyslog/issues/65
2014-04-30 11:20:07 +02:00
Rainer Gerhards
1286764ecb add support for date-wdayname to TIMEGENERATED property 2014-04-29 15:50:16 +02:00
Rainer Gerhards
191ea63f3e also support "wdayname" date format in list templates 2014-04-29 15:45:49 +02:00
Rainer Gerhards
25e8881d95 add date-wdayname property modifier
see also: https://github.com/rsyslog/rsyslog/issues/65
2014-04-29 13:13:51 +02:00
Rainer Gerhards
b43ce5db61 bugfix: mmexternal did potentially pass incomplete data to restarted external plugin
This could happen if EPIPE was returned "too late", in which case the
beginning of the data could be lost.
2014-04-28 17:24:44 +02:00
Rainer Gerhards
d385aa6dc0 bugfix: mmexternal did not properly process messages over 4KiB
The data to be passed to the external plugin was truncated after 4KiB.
see: https://github.com/rsyslog/rsyslog/issues/64
2014-04-28 17:21:40 +02:00
Rainer Gerhards
bc9543b34c imrelp: disable legacy module config directives if new style was used 2014-04-28 12:48:56 +02:00
Rainer Gerhards
cddbdf1ff2 imrelp: remove new legacy paramter $InputRELPServerInputName
see: https://github.com/rsyslog/rsyslog/pull/63
2014-04-28 12:37:44 +02:00
Rainer Gerhards
8f3356a95e imrelp: re-instantiate backward compatibility ruleset handling
see: https://github.com/rsyslog/rsyslog/pull/63
2014-04-28 12:34:36 +02:00
Rainer Gerhards
4526c09638 maintain ChangeLog, fix no-longer-correct comment 2014-04-27 15:42:59 +02:00
Rainer Gerhards
b33c796b63 Merge pull request #63 from bobthesecurityguy/master
Added per-listener ruleset and inputname support to imrelp.
2014-04-27 14:32:30 +02:00
Bob
1751ecf137 Added per-listener ruleset and inputname support to imrelp. 2014-04-25 14:28:54 -05:00
Rainer Gerhards
2a7ef9b994 prepare for 8.3.1 release v8.3.1 2014-04-24 10:19:21 +02:00
Rainer Gerhards
9009761028 Merge branch 'v8-stable'
Conflicts:
	ChangeLog
	configure.ac
2014-04-18 10:38:27 +02:00
Rainer Gerhards
2c04bb2b64 prepare for 8.2.1 release v8.2.1 2014-04-17 10:24:15 +02:00
Rainer Gerhards
04436f104c mention important change 2014-04-17 10:18:10 +02:00
Rainer Gerhards
e6eb7ede82 Merge branch 'v7-stable' into v8-stable 2014-04-17 10:17:10 +02:00
Rainer Gerhards
b036da8bd5 mention json-c 0.12 support in ChangeLog (due to json-c security issue) 2014-04-17 10:16:40 +02:00
Rainer Gerhards
7c62158387 build system: do not modify user variable CFLAGS
closes: https://github.com/rsyslog/rsyslog/issues/56
2014-04-16 13:06:53 +02:00
Rainer Gerhards
88c62ba55c Merge branch 'v8-stable' 2014-04-16 10:20:25 +02:00
Rainer Gerhards
e06aa53150 Merge branch 'v7-stable' into v8-stable 2014-04-16 10:20:13 +02:00
Thomas D
d6f5d5aae5 Fix for https://github.com/rsyslog/rsyslog/issues/61
Based on Maxim Koltsov proposed patch from https://bugs.gentoo.org/show_bug.cgi?id=507730
2014-04-16 10:17:50 +02:00
Rainer Gerhards
76e252a2d9 fix copyright
I used the CC anonymizer as copy template, but removed all of the
actual CC anonymization part.
2014-04-15 15:40:30 +02:00
Rainer Gerhards
92bd631e4f bugfix: build problems with lexer.l on some platforms
For some reason, the strdup() prototype and others are missing. I admit
that I don't know why, as this happens only in 8.3.0+ and there is no
indication of changes to the affected files. In any case, we need to
fix this, and the current solution works at least as an interim one.
2014-04-15 15:11:23 +02:00