329 Commits

Author SHA1 Message Date
Rainer Gerhards
2bd4e10a4d Merge branch 'beta'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tests/Makefile.am
	tests/manytcp-too-few-tls.sh
2011-06-21 16:11:58 +02:00
Rainer Gerhards
b71ef4abad Merge branch 'v5-stable' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tests/diag.sh
	tests/sndrcv_drvr.sh
2011-06-21 15:42:11 +02:00
Rainer Gerhards
475eb28e55 Merge branch 'v5-stable' into v5-devel
Conflicts:
	runtime/rsyslog.h
2011-06-16 18:39:06 +02:00
Rainer Gerhards
41d8672524 bugfix/improvement:$WorkDirectory now gracefully handles trailing slashes 2011-06-15 12:20:12 +02:00
Rainer Gerhards
b4daf5a03d step: imuxsock changed to new config system
now also properly works with privilege drop
2011-05-12 14:04:09 +02:00
Rainer Gerhards
79d46017e4 step: imudp utilizes interim new input module interface 2011-05-04 14:41:08 +02:00
Rainer Gerhards
1bfaf4ac06 better handling of queue i/o errors in disk queues.
This is kind of a bugfix, but a very intrusive one, thus it goes
into the devel version first. Right now, "file not found" is
handled and leads to the new emergency mode, in which disk action
is stopped and the queue run in direct mode. An error message is
emited if this happens.
2011-05-03 12:27:49 +02:00
Rainer Gerhards
28e750eebd step: slowly migrating config settings... ;) 2011-04-19 14:58:31 +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
e69efbb6d7 enhance: added $BOM system property to ease writing byte order masks 2011-03-22 16:55:11 +01:00
Rainer Gerhards
9568e7dbbb Merge branch 'v5-beta'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	runtime/glbl.c
	tools/omdiscard.c
2011-02-18 10:51:14 +01:00
Rainer Gerhards
49c2bc380c improved error reporting for $WorkDirectory
non-existance and other detectable problems are now reported,
and the work directory is NOT set in this case
2011-02-15 11:06:15 +01:00
Rainer Gerhards
7974621502 Merge branch 'v5-devel'
Conflicts:
	plugins/imfile/imfile.c
	plugins/imudp/imudp.c
	plugins/ommysql/ommysql.c
2011-02-01 12:22:36 +01:00
Rainer Gerhards
f7c2092004 Merge branch 'v5.6.2-newimudp' into v5-devel-newimudp
Conflicts:
	plugins/imudp/imudp.c
	threads.c
2011-01-10 12:54:21 +01:00
Dražen Kačar
7742b2182f improved imudp real-time scheduling support & bugfix
The original code had quite some issues, which are fixed by this
commit. Also we do more error checking now.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2011-01-10 12:39:23 +01:00
Rainer Gerhards
471f07f45a milestone: template supports CEE output via %$!all-json% 2010-12-01 10:19:50 +01:00
Rainer Gerhards
b9d3cdceab milestone: added mmnormalize (compiles, but untested) 2010-12-01 08:46:20 +01:00
Rainer Gerhards
786a44a024 Merge branch 'v5-devel'
Conflicts:
	runtime/rsyslog.h
2010-11-25 18:04:00 +01:00
Rainer Gerhards
44300ddcb2 Merge branch 'v5-beta' into v5-devel
Conflicts:
	ChangeLog
	configure.ac
	doc/imfile.html
	plugins/imfile/imfile.c
	runtime/rsyslog.h
2010-11-25 17:43:51 +01:00
Rainer Gerhards
a3c81f500a bugfix: replacements for atomic operations for non-int sized types had problems.
At least one instance of that problem could potentially lead
to abort (inside omfile).
2010-11-25 17:20:55 +01:00
Rainer Gerhards
5d8b1846ec Merge branch 'v4-devel' into v5-beta
Conflicts:
	Makefile.am
	tests/tcpflood.c
2010-10-15 08:06:40 -07:00
Rainer Gerhards
c7e9e2123e Merge branch 'v5-devel'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imuxsock/imuxsock.c
	runtime/rsyslog.h
2010-10-05 16:10:27 +02:00
Rainer Gerhards
d8a1489f54 omhdfs: cleanup and lots of improvement
now things look much better, also done some prep in order to
support a file cache (we need this for multiple selectors writing
to the same file).
2010-10-01 11:29:50 +02:00
Rainer Gerhards
054d2ccdd6 imuxsock: added per-socket hash tables/rate limiters & severity filter
rate limiting now applies only to messages with a given severity or above. By
default, emergency messages are NOT rate-limited.
2010-09-28 17:26:28 +02:00
Rainer Gerhards
c2d36c6894 patching SCM_CREDENTIALS pid into TAG of imuxsock read messages 2010-09-26 18:57:05 +02:00
Rainer Gerhards
e86cb62f12 improved statistics-gathering subsystem
... well, actually this is a first real implementation of this subsystem.
I have added a counter registry, a way to access the countres (as readable
string) and a way to define and maintem them. Also, module impstats has
been updated to utilize the new system. Finally, I added some counters. I
hope that this sets the baseline for useful future enhancements.
2010-09-13 15:43:56 +02:00
Rainer Gerhards
99b3b670e8 Merge branch 'master' into tmp
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/omudpspoof/omudpspoof.c
	runtime/rsyslog.h

also updated omuxsock and imptcp to new interfaces
2010-08-11 13:49:36 +02:00
Rainer Gerhards
a77a99bfbf Merge branch 'v4-devel' into master
Conflicts:
	Makefile.am
	tests/tcpflood.c
2010-08-11 12:49:16 +02:00
Rainer Gerhards
32e715929f Merge branch 'v4-stable-imptcp' into tmp
Conflicts:
	Makefile.am
	configure.ac
	runtime/rsyslog.h
	tests/Makefile.am
2010-08-11 11:49:32 +02:00
Rainer Gerhards
55256ac968 added imptcp
imptcp is a simplified, Linux-specific and potentielly fast
syslog plain tcp input plugin (NOT supporting TLS!)
2010-08-10 14:51:43 +02:00
Rainer Gerhards
c8ee85614b solving an error ID collision with v5 build 2010-08-06 17:43:01 +02:00
Rainer Gerhards
40e70777ea Merge branch 'v4-devel'
Conflicts:
	ChangeLog
	Makefile.am
	configure.ac
	doc/rsyslog_conf_modules.html
	runtime/rsyslog.h
	tests/Makefile.am
2010-08-06 17:32:29 +02:00
Rainer Gerhards
80ff634c84 added omuxsock, which permits to write message to local Unix sockets
this is the counterpart to imuxsock, enabling fast local forwarding
2010-08-06 17:25:38 +02:00
Rainer Gerhards
d18b238f16 milestone commit: output plugin interface changes (may NOT run)
The output interface has been changed, but we do not yet utilize the
new interface. Also, it looks like a regression was introduced. But before
hunting it down, I'd like to make a commit (what also easys the regresion
hunt).
2010-07-27 09:44:35 +02:00
Rainer Gerhards
4eadfb6481 first shot at scoping (for actions only)
parser now supports $Begin action, $End action, $StrictScoping,
but not yet the actual semantics.
2010-07-23 15:22:47 +02:00
Rainer Gerhards
e64cd21243 moving towards scoping inside rsyslog.conf
first step: adding object-type specifier to config statement table
2010-07-21 18:08:19 +02:00
Rainer Gerhards
6e093aa326 made hardcoded max string number persistent
see commit for reasoning
2010-06-24 14:05:00 +02:00
Rainer Gerhards
31fae7b93d bugfix: "$ActionExecOnlyWhenPreviousIsSuspended on" was broken
Note that, as it looks, the directive was already broken in previous v5 versions.
So while I solved what looked like a (intentional) regression from the
performance tuning, I actually solved a previous regression as well ;)

I have also added new test cases to the testbench in order to capture such
problems in the future. This version does now look pretty good in shape.
2010-06-24 12:13:48 +02:00
Rainer Gerhards
74135da959 some cleanup
as well as some work in preparation of storing doAction params inside
the batch
2010-06-10 12:24:22 +02: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
24ad305375 Merge branch 'v4-devel' into master
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2010-04-23 13:02:41 +01:00
Rainer Gerhards
c4b0f6bcae Merge branch 'v4-devel' into master
Conflicts:
	runtime/rsyslog.h
	runtime/wtp.c
2010-04-23 11:43:00 +01:00
Rainer Gerhards
3a12d05433 solved alignment errors on Solaris Sparc 2010-04-22 14:38:12 +01:00
Rainer Gerhards
afe45bbbe2 fixed typo ... that caused compilation to fail on non-Solaris 2010-04-22 15:09:40 +02:00
Rainer Gerhards
f902c9ca48 removed some complier warnings 2010-04-21 18:25:17 +01:00
Rainer Gerhards
236c96ffb1 cleanup of some compiler warnings 2010-04-21 18:16:57 +01:00
Rainer Gerhards
527edddb46 Merge branch 'v4-devel'
Conflicts:
	runtime/msg.h
	runtime/rsyslog.h
	runtime/stream.c
2010-04-19 18:47:06 +02:00
Rainer Gerhards
84084ea2a1 improved quality of imsolaris code
including refctoring for a more simple solution
2010-04-19 18:39:55 +02:00