7613 Commits

Author SHA1 Message Date
Rainer Gerhards
62c26362b3 Merge branch 'v7-stable' into v8-stable
Conflicts:
	action.c

I needed to adopt the v7 changes to the new non-batch inner
processing. This may have some bug potential.
2014-07-10 19:42:57 +02:00
Rainer Gerhards
68785745f2 maintain ChangeLog 2014-07-10 18:51:44 +02:00
Rainer Gerhards
78eb094a9f Merge branch 'v7-stable-act-tpl-passing-mode' into v7-stable
Conflicts:
	ChangeLog
2014-07-10 08:30:29 +02:00
Rainer Gerhards
06804bd370 fix cosmetic mem leak in tzinfo infrastructure
it's cosmetic, because it happens only during shutdown, so the OS
clean up a microsecond later in any case. But good to solve this
for valgrind AND future extensions.
2014-07-09 19:39:48 +02:00
Rainer Gerhards
56b17e6a81 make datetime parser use new tzinfo infrastructure
also do some additons/modifications to infrastructure
2014-07-09 19:34:12 +02:00
Rainer Gerhards
d426ac4af2 new tzinfo config object -- permits to define time zone offsets 2014-07-09 19:11:59 +02:00
Rainer Gerhards
09b4492f0a Merge branch 'master' into master-timezone-def
Conflicts:
	grammar/lexer.l
	grammar/rainerscript.h
2014-07-09 15:01:23 +02:00
Rainer Gerhards
5cba7d2f55 Merge branch 'v7-stable' into v8-stable 2014-07-09 11:56:44 +02:00
Rainer Gerhards
84f984f5b5 bugfix: double-free when ruleset() parser parameters were used
While unlikely, this could cause stability issues even after the
config phase.
2014-07-09 11:56:18 +02:00
Rainer Gerhards
abc4c79c6c pmciscoios: support optional parsing ORIGIN field 2014-07-08 21:14:48 +02:00
Rainer Gerhards
ac333cd917 cleanup no longer needed dependency 2014-07-08 20:50:19 +02:00
Rainer Gerhards
382cc3b156 Merge branch 'master' into master-parser-obj 2014-07-08 20:45:54 +02:00
Rainer Gerhards
447460d5af maintain ChangeLog 2014-07-09 11:58:05 +02:00
Rainer Gerhards
6c8bd8de1d Merge branch 'v8-stable' 2014-07-09 11:56:56 +02:00
Rainer Gerhards
27ba29abfc implement parse() config object
including the necessary plumbing to support multiple parser
instances
2014-07-08 20:44:43 +02:00
Rainer Gerhards
cfb95b1ac8 bugfix: mishandling of input modules not supporting new input instances
If they did not support this, accidently the output module part of the
module union was written, leading to unpredictable results. Note: all
core modules do support this interface, but some contributed or very
old ones do not.
2014-07-08 18:19:58 +02:00
Rainer Gerhards
9bb5db3455 timezone() object: prep work 2014-07-08 16:42:09 +02:00
Rainer Gerhards
f5e50fdc44 Merge remote-tracking branch 'github/master' 2014-07-08 16:18:34 +02:00
Rainer Gerhards
ff2ec4001f Merge branch 'v8-stable-newparsers' 2014-07-08 16:17:15 +02:00
Rainer Gerhards
fb8a634cf4 pmciscoios: hardcode some time zone offsets 2014-07-08 16:09:40 +02:00
Rainer Gerhards
4da700873e pmciscoiso: support Nexus TZ string in date (but right now ignore it)
This does not longer give a parsing error, however, no information is right
now obtained from that TZ string.
2014-07-08 15:51:52 +02:00
Rainer Gerhards
cda27324b8 bugfix: output modules with parameters with multiple passing modes could cause strange behaviour including aborts
This was due to the fact that the action module only preserved and
processed the last set passing mode. Note that this was not a problem
for the plugins provided by the rsyslog git: none of them uses different
passing modes.
Thanks to Tomas Heinrich for providing a very detailled bug report.
2014-07-06 17:48:30 +02:00
Rainer Gerhards
e0b300193d bugfix: ommysql: handle/mem leak upon termination of worker thread
This could become bad if the (instance) worker threads are often
started and terminated. But it takes quite a while to show effect.
2014-07-05 22:23:01 +02:00
Rainer Gerhards
e735113466 Merge branch 'v8-stable' 2014-07-05 17:50:33 +02:00
Rainer Gerhards
f30a087b2d testbench: experimentally add more mysql tests 2014-07-05 17:49:55 +02:00
Rainer Gerhards
a57801af9b Merge branch 'v7-stable' into v8-stable 2014-07-05 17:27:42 +02:00
Rainer Gerhards
88cb565826 testbench: add mysql tests
but do not yet activate them
2014-07-05 17:12:00 +02:00
Rainer Gerhards
b0f698bad6 support prepended year in RFC3164 timestamp
again, regression potential is extremely slim. this is done e.g.
by Brocade devices. Note that the timestamp must contain only
ONE year (either in front or after month/day). If two are present,
it is flagged invalid (what it obviously really is).
2014-07-04 05:23:24 +02:00
Rainer Gerhards
a30a4b8aac pmciscoios: first functional version 2014-07-04 04:45:24 +02:00
Rainer Gerhards
146656700a support fractional seconds in RFC3164 timestamp
regression potential is minimal and this happens frequently
enough in practice to become part of the heuristic
2014-07-04 04:44:33 +02:00
Rainer Gerhards
548962d519 pmciscoios: skeleton & first rough implementation approach (yet incomplete) 2014-07-04 00:36:16 +02:00
Rainer Gerhards
205deff73d Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog 2014-07-03 13:54:44 +02:00
Rainer Gerhards
de7c6cf695 prepare for 8.3.3 release v8.3.3 2014-07-03 13:54:22 +02:00
Rainer Gerhards
bb91dfcb3d make testbench run serial on new automake 2.69 2014-07-03 12:31:41 +02:00
Rainer Gerhards
8d2f5bc657 Merge branch 'v8-stable' 2014-07-01 09:28:45 +02:00
Rainer Gerhards
21efb64e5e testbench: support environments with limit on nbr of open sockets 2014-07-01 09:23:33 +02:00
Rainer Gerhards
162f97600c unify input object naming
imudp now supports "name" paramter, as other inputs do. "inputname" has
been deprecated, but can still be used. Same applies to "appendport"
subparamter". Thanks to "Nick Syslog" for the suggestion.
2014-06-26 09:09:47 +02:00
Rainer Gerhards
b9e7225085 Merge remote-tracking branch 'github/master' 2014-06-23 12:05:11 +02:00
Rainer Gerhards
f364abd2ec Merge branch 'v8-stable' 2014-06-23 12:04:43 +02:00
Rainer Gerhards
2d4348112f Merge branch 'v7-stable' into v8-stable 2014-06-23 12:04:34 +02:00
Rainer Gerhards
2556a56fee Merge branch 'v7-stable' into v8-stable 2014-06-21 18:45:49 +02:00
Rainer Gerhards
a531d15c3e bugfix: file descriptor leak with Guardtime signatures
When a .gtstate file is opened it is never closed. This is especially
bad when dynafiles frequently get evicted from dynafile cache and be
re-opened again.
2014-06-21 09:39:54 +02:00
Rainer Gerhards
6f0f71001d Merge branch 'v7-stable' into v8-stable 2014-06-21 06:49:23 +02:00
Michael Biebl
b1cbb1b1f4 regression fix: invalid pidfile location
closes: https://github.com/rsyslog/rsyslog/issues/86
2014-06-21 06:48:33 +02:00
Rainer Gerhards
a0093d8f52 bugfix: README.md was missing in release tarball
closes: https://github.com/rsyslog/rsyslog/issues/91
2014-06-18 21:03:53 +02:00
Rainer Gerhards
e262941b25 bugfix: make dist failed due to removed header file
this was forgotten to remove from the makefile
2014-06-18 21:00:55 +02:00
Rainer Gerhards
86ce892278 maintain ChangeLog 2014-06-18 20:09:48 +02:00
Susant Sahani
14fe6db4e9 imtcp: fix busy-loop in the tcp listener
This patch fixes the high CPU usage when rsyslog
run out of FDs

reference
http://lists.adiscon.net/pipermail/rsyslog/2013-October/034488.html

Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
Signed-off-by: Susant Sahani <susant@redhat.com>
2014-06-18 20:08:27 +02:00
Rainer Gerhards
e02132f101 Merge pull request #88 from chewi/master
fix broken PostgreSQL database creation
2014-06-13 18:43:59 +02:00
James Le Cuirot
ee54d0e4dc fix broken PostgreSQL database creation
Quoting is really really important under PostgreSQL. Giving the
database name in single quotes simply won't work. Giving it in double
quotes is not the same as not quoting it at all. rsyslog has
traditionally connected case-sensitively to "Syslog" but accessed the
tables case-insensitively so we should follow suit here.

Furthermore, you cannot create a table based on template1 with a
different encoding. template0 must be used instead.
2014-06-13 17:20:50 +01:00