rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-19 06:50:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,748 Commits 67 Branches 505 Tags
Commit Graph

218 Commits

Author SHA1 Message Date
Miloslav Trmač
2f4292a81c Fix printing of some template options 
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2012-08-21 15:00:07 +02:00
Rainer Gerhards
9801893b29 Merge branch 'v5-stable-field-substring' into v5-beta 2012-04-27 09:55:11 +02:00
Rainer Gerhards
9c76723c5b added capability to specify substrings for field extraction mode 2012-04-27 09:42:53 +02:00
Rainer Gerhards
45dc0db51e Merge branch 'master-fieldext' 2012-04-26 16:03:30 +02:00
Rainer Gerhards
5624012710 added capability to specify substrings for field extraction mode 2012-04-26 15:50:49 +02:00
Rainer Gerhards
9ec02e670a cleanup: removed unused but set parameters 2012-04-23 17:31:26 +02:00
Rainer Gerhards
7f0cd8c8b9 added the "jsonf" property replacer option (and fieldname) & bugfix 
bugfix: property replacer option "json" could lead to content loss
        message was truncated if escaping was necessary
 2012-04-19 15:20:16 +02:00
Rainer Gerhards
b88ba949f8 added "date-unixtimestamp" property replacer option to format as a unix timestamp 2012-03-29 18:04:12 +02:00
Rainer Gerhards
62b7a1b8a8 added "json" property replacer option 2012-03-16 08:21:12 +01:00
Rainer Gerhards
6db75eb0d2 cleanup: different text escape types made more portable 2012-01-19 15:07:25 +01:00
Rainer Gerhards
03be2fcd7c Merge branch 'v5-devel' into master 
Conflicts:
	ChangeLog
	Makefile.am
	configure.ac
	doc/manual.html
	plugins/imptcp/imptcp.c
	plugins/imudp/imudp.c
	plugins/imuxsock/imuxsock.c
	runtime/parser.c
	template.c
	tools/omfwd.c
	tools/syslogd.c
 2012-01-18 14:51:33 +01:00
Nathan Scott
052b1c7594 add JSON escaping option 
Following the path taken by the two SQL formatting options,
which escape single quotes with double quotes (amongst other
things), this patch adds a JSON quoting option.  JSON is the
opposite to the SQL options, requiring double quotes to be
quoted within a string.  This patch provides a formatting
option implementing this requirement, while piggy-backing on
the existing code as much as possible.

Signed-off-by: Nathan Scott <nathans@aconex.com>
 2012-01-17 10:29:02 +01:00
Rainer Gerhards
d348558a51 milestone: conf obj interface now utilzes rsconf_t 2011-04-19 11:26:37 +02:00
Rainer Gerhards
f72bde2f70 milestone: templates are now in config object 2011-04-19 09:43:36 +02:00
Rainer Gerhards
b30e809a20 Merge branch 'v5-devel' 
Conflicts:
	configure.ac
	doc/manual.html
	doc/rsyslog_conf.html
	runtime/msg.c
	runtime/rsyslog.h
	template.c
 2011-03-31 17:08:01 +02:00
Rainer Gerhards
21ced790cd Merge branch 'v5-beta-strgen-bind' into v5-beta 2011-03-29 11:54:19 +02:00
Rainer Gerhards
6f9773f1fa bugfix: rsyslog did not build with --disable-regexp configure option 
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=243
 2011-03-28 17:40:15 +02:00
Rainer Gerhards
41d79b8fea bugfix: strgen could not be used together with database outputs 
because the sql/stdsql option could not be specified. This has been
solved by permitting the strgen to include the opton inside its name.
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=195
 2011-03-21 10:34:43 +01:00
Rainer Gerhards
e2f13df22c potential fix to issue that strgen's do not support SQL option 
needs testig and verification (wrong system for doing that ;))
 2011-03-21 09:53:55 +01:00
Rainer Gerhards
bcc3b2aef7 Merge branch 'v5-devel' 
Conflicts:
	ChangeLog
	action.c
	plugins/imudp/imudp.c
	runtime/glbl.c
 2010-12-17 13:20:55 +01:00
Rainer Gerhards
7817aa1597 bugfix: unitialized variable could cause issues under extreme conditions 
plus some minor nits. This was found after a clang static code analyzer
analysis (great tool, and special thanks to Marcin for telling me about
it!)
 2010-12-16 12:02:36 +01:00
Rainer Gerhards
48877c8ef4 milestone: added support for CEE-properties in property-based filters 2010-12-01 17:28:36 +01:00
Rainer Gerhards
471f07f45a milestone: template supports CEE output via %$!all-json% 2010-12-01 10:19:50 +01:00
Rainer Gerhards
71b8b60b22 bugfix: segfault when an *empty* template was used 
Bug: http://bugzilla.adiscon.com/show_bug.cgi?id=206
Thanks to David Hill for alerting us.
 2010-11-05 10:41:44 +01:00
Rainer Gerhards
d9e64c16e5 finshed implementation of strgen modules 
and also provided four build-in modules for the most common use
cases, hopefully resulting in a speedup of around 5% for typical
rsyslog processing.
 2010-06-04 12:45:31 +02:00
Rainer Gerhards
527bfcea5c first implementation of strgen interface 
and a first built-in strgen module. Some tweaks and more default strgens
are needed, but the code doesn't look too bad ;)
 2010-06-01 18:51:55 +02:00
Rainer Gerhards
59227a8618 experimental commit: facility to generate template via C function 
This was a test done to try to generate templates with C code, via
a new (potentially to-be-implemented) class of template modules. We have
a rough POC inside this code, and it showed around 5% or better speedup. So
it semms worth continuing in this direction.

Note that this experimental commit works correct, but does any
template in the form of

$template tpl,=somewhat

will lead to fixed template expansion based on the default file format.
 2010-06-01 13:53:12 +02:00
Rainer Gerhards
4e511087c4 some cleanup 2010-04-19 15:21:25 +02:00
Rainer Gerhards
b3c8528b50 added new property replacer option "date-rfc3164-buggyday" 
primarily to ease migration from syslog-ng. See property replacer doc
for details.
 2010-03-05 07:56:57 +01:00
Rainer Gerhards
c8ebe62337 Merge branch 'v4-beta' into beta 
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imuxsock/imuxsock.c
	template.c
	tests/Makefile.am
	tests/parsertest.sh
 2010-02-10 16:35:12 +01:00
Rainer Gerhards
dd2e1a6906 fixed a small memory leak during config file parsing 2010-02-09 17:47:16 +01:00
Rainer Gerhards
d71e8672c9 Merge branch 'v4-beta' into beta 2010-02-04 16:51:43 +01:00
Rainer Gerhards
ef193bf0ae Merge branch 'v4-stable' into v4-beta 2010-02-04 16:43:21 +01:00
varmojfekoj
8c3ab2e26f bugfix: several smaller bugs resolved after flexelint review 
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
 2010-02-04 16:02:57 +01:00
Rainer Gerhards
1541473074 some cleanup (removal of debug code) 2009-10-30 16:51:07 +01:00
Rainer Gerhards
e04e1b5002 enhanced test environment (including testbench) 
support for enhancing probability of memory addressing failure by
using non-NULL default value for malloced memory (optional, only if
requested by configure option). This helps to track down some
otherwise undetected issues within the testbench and is expected
to be very useful in the future.
 2009-10-22 11:33:38 +02:00
Rainer Gerhards
90e8475260 bugfix: message processing states were not set correctly in all cases 
however, this had no negative effect, as the message processing state
was not evaluated when a batch was deleted, and that was the only case
where the state could be wrong.
 2009-10-19 09:41:45 +02:00
Rainer Gerhards
ec56b763b8 bugfix in debug system and more instrumentation to find an issue 
bugfix: debug string larger than 1K were improperly displayed. Max size
is now 32K, and if a string is even longer it is meaningful truncated.
 2009-10-08 16:36:17 +02:00
Rainer Gerhards
bf8125f4e9 bugfix: minor static memory leak while reading configuration 
This did NOT leak based on message volume. Also, did some cleanup during
the commit.
 2009-07-20 12:18:20 +02:00
Rainer Gerhards
9de685929e bugfix: message could be truncated after TAG, often when forwarding 
This was a result of an internal processing error if maximum field
sizes had been specified in the property replacer.
Also did some testbench improvements, including omstdout.
 2009-07-09 16:32:14 +02:00
Rainer Gerhards
cafb951020 bugfix: message could be truncated after TAG, often when forwarding 
This was a result of an internal processing error if maximum field
sizes had been specified in the property replacer.
 2009-07-09 12:25:51 +02:00
Rainer Gerhards
7ea63db2f9 optimization: propert names are now internally identified by integers 2009-06-26 15:31:40 +02:00
Rainer Gerhards
464dcf2339 some more stringbuffer optimization 2009-06-25 18:44:48 +02:00
Rainer Gerhards
3abf567d2b optimized template string generation 2009-06-19 16:07:17 +02:00
Rainer Gerhards
f33dd51c80 fixed abort condition with oversize tags 
this was a regression I introduced this afternoon
 2009-06-18 17:48:11 +02:00
Rainer Gerhards
df9012f755 slight optimization of template generation 2009-06-18 16:20:06 +02:00
Rainer Gerhards
f7579e68a6 done various optimizations to the stringbuf and its users 2009-06-16 11:36:05 +02:00
Rainer Gerhards
ec0e2c3e7d added a new way how output plugins may be passed parameters. 
This is more efficient for some outputs. They new can receive fields not only
as a single string but rather in an array where each string is seperated.
 2009-04-03 12:51:02 +02:00
Rainer Gerhards
3954f2e166 added new "csv" property replacer option 
to enable simple creation of CSV-formatted outputs (format
from RFC4180 is used)
 2009-04-02 12:48:07 +02:00
Rainer Gerhards
c9078c7220 Merge branch 'v3-stable' into beta 
Conflicts:

	ChangeLog
	doc/manual.html
 2008-11-11 12:58:53 +01:00