299 Commits

Author SHA1 Message Date
Rainer Gerhards
9e434f19a9 cleaned up stream class ...
... and also made it callable via an rsyslog interface rather then
relying on the OS loader (important if we go for using it inside
loadbale modules, which we soon possible will)
2009-06-04 12:15:59 +02:00
Rainer Gerhards
7dee07ea0c Merge branch 'master' into omfile 2009-06-04 10:33:42 +02:00
Rainer Gerhards
e893a59164 backported macros necessary to create output modules with transaction support
this does not mean the v4 engine will support batches and output
transactions, but I can now write plugins that will work equally well
with v4 AND v5. I consider this useful during the rewrite of omfile.
2009-06-04 10:32:12 +02:00
Rainer Gerhards
58e707b441 backported some of the v5 testbench
this permits us to keep a persistent test environment between
v4 and v5, most importantly using the same tools. As far as the
actual tests are concerned, some had issues. I had no time to check
if that was an issue with the test or an actual issue with the
v3/4 engine. Will do that at some later stage.
2009-06-04 09:57:45 +02:00
Rainer Gerhards
69eac5341d added gzip header to output files
so they can now be processed with the "regular" gzip tools
2009-06-03 15:32:39 +02:00
Rainer Gerhards
f54e72cec0 first proof of concept on zipped file writer
This DOES NOT work sufficiently well, I just wanted to verify that
zip writing is possible and files are readable. Will be refined
soon.
2009-06-03 14:45:09 +02:00
Rainer Gerhards
b61e5fffc4 strmsrv now supports KEEPALIVE socket option 2009-06-02 13:11:18 +02:00
Rainer Gerhards
05ba5fc29f slightly extended strms_sess interface 2009-06-02 12:22:00 +02:00
Rainer Gerhards
14d1209640 added a generic network stream server
(in addition to rather specific syslog tcp server)
2009-06-02 10:31:42 +02:00
Rainer Gerhards
d9f1bbf46e Merge branch 'beta'
Conflicts:
	runtime/rsyslog.h
2009-05-29 17:41:28 +02:00
Rainer Gerhards
3e2be47ed6 Merge branch 'v3-stable' into beta
Conflicts:
	runtime/rsyslog.h
2009-05-29 17:40:48 +02:00
Rainer Gerhards
2cf3b2fa3c fixed a regression of yesterday's patch
... I know I should not have done this to a stable branch... Thankfully
nothing was yet released.
2009-05-29 17:39:32 +02:00
Rainer Gerhards
d7c98e7a6e Merge branch 'beta' into master
Conflicts:
	tests/Makefile.am
2009-05-28 18:34:17 +02:00
Rainer Gerhards
8d8befaeca Merge branch 'v3-stable' into beta
Conflicts:
	tests/Makefile.am
2009-05-28 18:23:53 +02:00
Rainer Gerhards
23dac82b68 small enhancement: config validation run now exits with code 1 if an error is detected.
This change is considered important but small enough
to apply it directly to the stable version. [But it is a border case,
the change requires more code than I had hoped. Thus I have NOT tried
to actually catch all cases, this is left for the current devel
releases, if necessary]
2009-05-28 17:59:11 +02:00
Rainer Gerhards
a900a7c34b greatly enhanced testbench
The imdiag module now can very effectively inject messages, which also
frees us from uncertainties of tcp reception and processing. All shell
script based tests have been modularized, what makes it far easier to
create new tests. Also, the test bench now executes more reliable and
much faster, because we can now rely on actual engine information where
we previously did just a dumb sleep.
2009-05-27 11:29:47 +02:00
Rainer Gerhards
b954938027 solved some issues with testbench & a race condition 2009-05-25 14:16:31 +02:00
Rainer Gerhards
7a7ec37f99 improved testbench / solved imdiag race condition
imdiag/imtcp had a modload race condition (as imdiag is a testing aid,
this has no implications for production deployments). Also, I replaced
netcat by a custom program to talk to imdiag. This, for the first time ever,
is now a Java program. I plan to add some GUI troubleshooting tools and
thought it is a good idea to start doing things in Java that can simply
be done in that language.
2009-05-25 13:02:06 +02:00
Rainer Gerhards
eb1615068c added new testing module imdiag
which enables to talk to the rsyslog core at runtime. The current
implementation is only a beginning, but can be expanded over time
2009-05-25 10:47:22 +02:00
Rainer Gerhards
7adb9877f0 fixing some nits with the build system 2009-05-22 17:40:24 +02:00
Rainer Gerhards
aba90e8248 added capability to run multiple tcp listeners (on different ports)
Well, actually this and a lot of related things. I improved the
testbench so that the new capabilities are automatically tested and
also did some general cleanup. The current multiple tcp listener
solution will probably receive some further cleanup, too, but looks
quite OK so far. I also reviewed the way tcpsrv et all work, in
preparation of using this code for imdiag. I need to document the
findings, especially as the code is rather complicated "thanks" to
the combination of plain tcp and gssapi transport modes.
2009-05-22 17:06:52 +02:00
Michael Biebl
5ab3e8005f Fix compiler warnings
include <string.h> for memcpy and strlen.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-05-19 07:31:22 +02:00
Michael Biebl
aa07f62f10 Fix compiler warnings
Include <string.h> for memcpy and strlen.
2009-05-12 09:31:26 +02:00
Rainer Gerhards
8e430258fd added capability to draw configuration graphs
- added $GenerateConfigGraph configuration command which can be used
  to generate nice-looking (and very informative) rsyslog configuration
  graphs.
- added $ActionName configuration directive (currently only used for
  graph generation, but may find other uses)
2009-05-11 17:38:33 +02:00
Rainer Gerhards
925a5e3471 Merge branch 'beta'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2009-04-23 11:48:47 +02:00
Rainer Gerhards
b38a2208f4 Merge branch 'v3-stable' into beta
Conflicts:
	ChangeLog
	runtime/queue.c
2009-04-23 11:43:12 +02:00
Rainer Gerhards
2e51c75938 bugfix: light and full delay watermarks had invalid values
... badly affecting performance for delayable inputs (but not causeing
any other issues)
2009-04-23 11:33:40 +02:00
Rainer Gerhards
889a0a1da8 some cleanup
... mostly removal of compile-time warnings (thanks to Michael
Biebl for suggesting to look after that)
2009-04-17 15:19:57 +02:00
Rainer Gerhards
4beff8dab6 Merge branch 'nextmaster' into oracle
Conflicts:
	runtime/rsyslog.h
2009-04-16 17:28:29 +02:00
Rainer Gerhards
2d5e8ba7cd added a new error code for too-old rsyslog core
which can be emittend when plugin can not load due to missing
core functionality.
2009-04-16 17:26:07 +02:00
Rainer Gerhards
85ccd6e9b7 Merge branch 'omprog' into nextmaster
Conflicts:
	ChangeLog
	runtime/rsyslog.h
2009-04-14 14:49:01 +02:00
Rainer Gerhards
04272876d1 implemented $MaxOpenFiles directive and changed testbench
... to utilize it. This work is not yet fully verified to be correct.
2009-04-14 13:52:07 +02:00
Rainer Gerhards
a5b4cb1681 Merge branch 'beta'
Conflicts:
	ChangeLog
	tcpsrv.c
	tcpsrv.h

Note: we have a slight inconsistency, as interface version v4 was already
used for tcpsrv in this branch. We accept this inconsistency.
2009-04-09 13:44:52 +02:00
Rainer Gerhards
0cade5118f Merge branch 'v3-stable' into beta
Conflicts:
	ChangeLog
2009-04-09 13:41:38 +02:00
Rainer Gerhards
5e4fc93dd5 Merge branch 'v2-stable' into v3-stable 2009-04-09 12:28:08 +02:00
Rainer Gerhards
1cfa08749b bugfix: solved potential memory leak in msg processing
could manifest itself in imtcp (loss of a few bytes for *each* received
message - but depended on config) -- this was newly introduced
2009-04-08 18:59:15 +02:00
Rainer Gerhards
829385ce40 Merge branch 'beta'
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	doc/rsyslog_conf.html
2009-04-07 14:58:58 +02:00
Rainer Gerhards
04b06af335 improved parser test suite
new tests added, now much better
2009-04-03 18:20:52 +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
d747083e54 Merge branch 'regex' 2009-04-02 17:56:10 +02:00
Rainer Gerhards
4ab540e3ba fully integrated regex patch
Now have removed the previous method, as really nobody should call
it any longer (and now nobody does ;)). Also did some other cleanup.
2009-04-02 17:54:48 +02:00
Rainer Gerhards
1d16216aa3 streamlined regex patch
- abided to code conventions
- fixed a potential segfault when regex library can not
  be loaded
2009-04-02 16:51:53 +02:00
Rainer Gerhards
a86e42028a improved performance of regexp-based filters
Thanks to Arnaud Cornet for providing the idea and initial patch.
2009-04-02 16:16:57 +02:00
Rainer Gerhards
8de35eaa2c clean compile on solaris 2009-04-02 15:37:17 +02:00
Rainer Gerhards
eb807027af added O_CLOEXEC to open() calls
to make sure only the minimum number of file handles is left open
during a exec call. This is not a 100% solution, as there are also
some fopen() calls and, more importantly, file descriptors opened
by libraries. But it is better than nothing (and it was quick, at
least until we run into platform hell, what we will for sure ;)).
2009-04-02 15:12:57 +02:00
Rainer Gerhards
c250c50633 Merge branch 'v3-stable' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2009-04-02 14:49:04 +02:00
Rainer Gerhards
01adeab0cb preparing for 3.20.5 release 2009-04-02 14:41:32 +02:00
Rainer Gerhards
589f8af56c Merge branch 'dapatch' into v3-stable 2009-04-02 13:04:09 +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
01f2c7a7a3 improved omprog, now ready for first practical testing 2009-04-01 18:17:20 +02:00