2440 Commits

Author SHA1 Message Date
Rainer Gerhards
cb0fa751b7 Merge branch 'master' into tmp
Conflicts:
	tests/Makefile.am
2009-05-19 09:24:03 +02:00
Rainer Gerhards
55714cdb44 updated ChangeLog with Michael Biebl's changes 2009-05-19 09:17:13 +02:00
Michael Biebl
4f691b1e1d Cleanup configure.ac a little for better readability
- Use 2 new lines as separator between configure options.
- Remove forgotten copy&paste text.
- Reorder and move template configure option to the end.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-05-19 07:31:23 +02:00
Michael Biebl
541d7ad940 Improve ./configure output
Improve readability of the ./configure output by grouping relevant entries and
indenting them.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-05-19 07:31:22 +02:00
Michael Biebl
67974ecd5d Rename want_gssapi_krb5 to enable_gssapi_krb5
Be consistent and rename the configure variable want_gssapi_krb5 to
enable_gssapi_krb5.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-05-19 07:31:22 +02:00
Michael Biebl
460edfe27f Do not fail "make check" if omstdout is not enabled
Only run omod-if-array.sh and parsertest.sh test if omstdout plugin is
enabled.
Remove the comment and fix the help output for --enable-stdout (default
was "no", not "yes")

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-05-19 07:31:22 +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
735a02c656 Cleanup and typo fixes
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-05-19 07:31:22 +02:00
Michael Biebl
81875845e6 Add autogen.sh
This file is useful for building rsyslog from git.
It is a shortcut for
autoreconf and ./configure and enables shave by default.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-05-19 07:31:21 +02:00
Michael Biebl
1bbd2b07f8 Add shave support
shave tranforms the verbose autotools output into a pretty Kbuild-like
one which makes it easier to spot warnings.

See also
http://damien.lespiau.name/blog/2009/02/18/shave-making-the-autotools-output-sane/
git clone git://git.lespiau.name/shave

By default, shave is disabled and you have to explicitly enable it via
./configure --enable-shave.

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-05-19 07:31:21 +02:00
Rainer Gerhards
fe5bea77ac removed queue's UngetObj() call
... which is no longer needed thanks to the new queue design.
2009-05-18 18:39:52 +02:00
Rainer Gerhards
93f873277b t-delete list implemented, queue store drivers updated...
... on the way to the ultra-reliable queue modes (redesign doc). This
version does not really work, but is a good commit point. Next comes
queue size calculation. DA mode does not yet work.
2009-05-18 17:28:34 +02:00
Rainer Gerhards
b81311ac70 worked more on the design document 2009-05-15 16:39:27 +02:00
Rainer Gerhards
20d4eb3b47 worked on rsyslog design document (queue design enhancement) 2009-05-14 18:52:55 +02:00
Rainer Gerhards
4a8c02870a moved user object destruction to queue itself
So far, the consumer was responsible for destroying objects. However, this
does not work well with ultra-reliable queues. This is the first move to
support them.
2009-05-13 16:00:15 +02:00
Rainer Gerhards
73b16a5d77 added test for property replacer field functionality to testbench
plus some cosmetic changes
2009-05-13 13:22:25 +02:00
Rainer Gerhards
e2b2298689 action batch processing implemented
... passed initial tests, but of course more are needed
2009-05-12 17:57:04 +02:00
Rainer Gerhards
fbb040b411 one astrisk too much - and we have a segfault... - fixed ;) 2009-05-12 15:58:11 +02:00
Rainer Gerhards
bb79e96dc3 moving to a cleaner implementation of batches
... now that we know what we need from a theoretical POV.
2009-05-12 15:27:40 +02:00
Rainer Gerhards
21b7f7e603 Merge branch 'master' into multi-dequeue
Conflicts:
	runtime/rsyslog.h
2009-05-12 09:18:04 +02:00
Rainer Gerhards
d1985c4a65 doc: given some concrete advise on the common %hostname% content problem 2009-05-11 22:00:48 +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
1e4f374d7d doc: added "overall picture" of what rsyslog is 2009-05-11 09:38:29 +02:00
Rainer Gerhards
2ca67f83aa worked on rsyslog design internals paper 2009-05-08 17:56:16 +02:00
Rainer Gerhards
9a41bcee58 added design document 2009-05-08 10:43:35 +02:00
Rainer Gerhards
9e1bb31a4d fixed some bugs & added testing helpers
The action state machine now works correctly and has been verified a
few hand-picked cases. I am missing automatted tests, though, this is
not easy to achive... Anyhow, I've improved omtesting, so that it can
be used in such automatted tests.
2009-05-07 13:37:25 +02:00
Rainer Gerhards
68877497a1 first shot at action state machine implemention (untested)
I am commiting it so that the code is visible, but will no begin
with the test environment.
2009-05-07 10:44:46 +02:00
Rainer Gerhards
bbb0d7c9d1 added action processing message state diagram 2009-04-30 19:59:32 +02:00
Luis Fernando Muñoz Mejías
9823c73d1d Make it recover from errors on insertions.
If the database rejected some entry, making the statement fail on it,
the batch was not cleaned and the same values were retried over and
over, causing a cascade of failures and a denial of service.

We use now OCI_BATCH_ERRORS so that everything valid in the batch is
inserted, and rejected values can be discarded.
2009-04-29 17:10:19 +02:00
Luis Fernando Muñoz Mejías
c35ce31aed Replace get_db_statement by a template.
Instead of reading a complete line, we'll use a template and delegate
in the core to read such template. Then, all omoracle has to do is to
find that template and use it as the prepared statement.

I'm not sure if this is the correct approach, though. It has to dig
too much into rsyslog's structures...

txt_statement is stored in a private area, so that we don't mess too
much with rsyslog's internals (I still don't feel comfortable with
this much digging into template structures).
2009-04-29 17:10:00 +02:00
Luis Fernando Muñoz Mejías
65a69831e9 Add the $OmoracleBatchItemSize directive
This directive controls the amount of memory needed for properties in
the batch. Users should specify the largest value they expect in the
statement. As per Rainer's comment:

on MAX_BUFSIZE: I'd tend to make this configurable, because with
RFC5424 messages can be much longer and RFC5425 now recommends a
minimum maximum size of 8K.

So we let users to choose. Maybe we need a sensible default value to
make users' lifes easier?

Also, the old non-vector based interface is not supported anymore. I
broke it already when moving to this stage.
2009-04-29 17:09:20 +02:00
Luis Fernando Muñoz Mejías
e65a30ddaa Add licensing information.
I'm not sure if GPLv3 contemplates the ability to link to proprietary
software, if it was previous work. I explicitly allow linking to OCI.
2009-04-29 17:08:37 +02:00
Rainer Gerhards
2debe89434 minor cleanup 2009-04-29 17:07:01 +02:00
Rainer Gerhards
10bab38993 begin implementation of new transactional output module interface
code is not complete, error cases are not handled.
2009-04-27 15:40:54 +02:00
Rainer Gerhards
8159d0a117 fixed abort condition in DA mode 2009-04-23 16:02:42 +02:00
Rainer Gerhards
6c5264159c fixing a small (newly-introduced) memory leak
... plus simplifying free() calls after agreement on mailing list
that we no longer need to check if the pointer is non-NULL
2009-04-23 14:29:41 +02:00
Rainer Gerhards
31ba42de66 Merge branch 'master' into multi-dequeue 2009-04-23 13:40:00 +02:00
Rainer Gerhards
42c3dcfc1c performance enhancement: imtcp calls parser no longer on input thread
but rather inside on of the potentially many main msg queue worker
threads (an enhancement scheduled for all input plugins where this is
possible)
2009-04-23 13:39:11 +02:00
Rainer Gerhards
5c0aeae8ab added $MainMsgQueueDequeueBatchSize and $ActionQueueDequeueBatchSize configuration directives 2009-04-23 12:50:07 +02:00
Rainer Gerhards
6feb866885 Merge branch 'master' into multi-dequeue 2009-04-23 11:51: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
f8d9aad082 bugfix: compile problems in im3195 2009-04-23 11:45:50 +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
feddb7ea18 improving debugging info a bit 2009-04-23 11:19:32 +02:00
Rainer Gerhards
50174408b0 added test for DA queue mode (in main msg queue) - needs more work
The problem is that the rsyslog engine writes messages too quickly, so
that the queue never enters DA mode. We still have some look contemption.
One possible solution (hopefully) is to finally move the parser code out
of imtcp and onto the next thread. Need to address these issues first, then
come back to the test case.
2009-04-22 18:37:56 +02:00
Rainer Gerhards
e4b3f6d287 now batches are handed down to the actual consumer
... but the action consumer does not do anything really intelligent
with them. But the DA consumer is already done, as is the
main message queue consumer.
2009-04-22 16:39:58 +02:00
Rainer Gerhards
7667845bd7 first attempt at dequeueing multiple batches inside the queue
... but this code has serious problems when terminating the queue, also
it is far from being optimal. I will commit a series of patches (hopefully)
as I am on the path to the final implementation.
2009-04-22 15:06:45 +02:00
Rainer Gerhards
b0cfe39c85 Merge branch 'master' into multi-dequeue 2009-04-22 08:53:00 +02:00
Rainer Gerhards
251e48a34c preparing for 4.1.7 v4.1.7 2009-04-22 08:52:13 +02:00