938 Commits

Author SHA1 Message Date
Rainer Gerhards
a6ed4b59cc Merge branch 'beta' 2009-06-18 11:11:59 +02:00
Rainer Gerhards
17133f2cd1 Merge branch 'v3-stable' into beta 2009-06-18 11:11:07 +02:00
Rainer Gerhards
bca66bc139 some minor bugfixes
- bugfix: invalid error message issued if $inlcudeConfig was on an empty
  set of files (e.g. *.conf, where none such files existed)
  thanks to Michael Biebl for reporting this bug
- bugfix: when run in foreground (but not in debug mode), a
  debug message ("DoDie called") was emitted at shutdown. Removed.
  thanks to Michael Biebl for reporting this bug
- bugfix: some garbagge was emitted to stderr on shutdown. This
  garbage consisted of file names, which were written during
  startup (key point: not a pointer error)
  thanks to Michael Biebl for reporting this bug
- bugfix: startup and shutdown message were emitted to stdout
  thanks to Michael Biebl for reporting this bug
2009-06-18 11:10:28 +02:00
Rainer Gerhards
98348ae03d Merge branch 'master' into omfile
Conflicts:
	ChangeLog
	runtime/msg.h
	tcps_sess.c
	tcpsrv.c
	tools/syslogd.c
2009-06-16 12:59:55 +02:00
Rainer Gerhards
74b2b24f50 removed long-obsoleted property UxTradMsg
... as well as some cleanup (some commented-out code is left to
support UxTradMsg again is someone really complains ;)).
2009-06-16 12:31:27 +02:00
Rainer Gerhards
ff6232d2be bugfix: error messages were not emitted to stderr in forked mode
stderr and stdo are now kept open across fork()
2009-06-15 08:12:14 +02:00
Rainer Gerhards
21dafea3ee implemented $OMFileFlushOnTXEnd directive
plus some cleanup...
2009-06-12 12:18:17 +02:00
Rainer Gerhards
7f7e5ef75a improved config error messages
now contain a copy of the config line that (most likely) caused the error
2009-06-12 09:57:50 +02:00
Rainer Gerhards
9704f129f7 added capability to fsync() queue disk files for enhanced reliability
also adds speed, because you do no longer need to run the whole file
system in sync mode. New testbench and new config directives:
- $MainMsgQueueSyncQueueFiles
- $ActionQueueSyncQueueFiles
2009-06-09 19:00:18 +02:00
Rainer Gerhards
76da7f9f4e added $OMFileIOBufferSize config directive and plumbing 2009-06-04 15:59:37 +02:00
Rainer Gerhards
768836ab79 reduced max value for $DynaFileCacheSize to 1,000
The former maximum of 10,000 really made no sense, even 1,000 is very high,
but we like to keep the user in control ;)).

Also, some general cleanup was done.
2009-06-04 11:05:41 +02:00
Rainer Gerhards
4f742a8e32 added config switch --enable-testbench=no to turn off testbench 2009-06-03 07:51:47 +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
36fe8d92f8 added ability for the UDP output action to rebind its send socket after sending n messages
New config directive $ActionSendUDPRebindInterval
added for the purpose. By default, rebinding is disabled. This is
considered useful for load balancers.
2009-05-29 17:25:16 +02:00
Rainer Gerhards
53fc3b9af9 Merge branch 'beta' 2009-05-29 14:24:58 +02:00
Rainer Gerhards
02929c7bbf Merge branch 'v3-stable' into beta 2009-05-29 13:57:50 +02:00
Rainer Gerhards
6ddb3249e6 fixed copy&paste error in previous commit
(testcase was only present in v4, so I did not spot the issue immediately)
2009-05-29 13:54:53 +02:00
Rainer Gerhards
2ed8e41b31 Merge branch 'v3-stable' into beta
Conflicts:
	ChangeLog
2009-05-29 13:52:55 +02:00
Rainer Gerhards
43c45bfebc fixed problem in syslog-protocol (now RFC5424) parser
... as well as some other minor issues.
2009-05-29 13:40:04 +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
varmojfekoj
d8ba1a0d9f bugfix: internal messages were emitted to whatever file had fd2
...when rsyslogd ran in forked mode (as usual!)

Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-05-28 16:01:34 +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
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
aaef9aa018 preparing for 4.3.1 2009-05-25 11:31:53 +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
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
Rainer Gerhards
362c006f0f relaxed GnuTLS version requirement to 1.4.0
after confirmation from the field that this version is sufficient.
I always thought so (I think I developed under 1.4.x), but had no
longer an environment to verify. Most imporantly, this means that
Centos users will have much less trouble building rsyslog/tls
support.
2009-05-19 09:18:51 +02:00
Rainer Gerhards
55714cdb44 updated ChangeLog with Michael Biebl's changes 2009-05-19 09:17:13 +02:00
Rainer Gerhards
b47d95286b bugfix: potential segfault issue when multiple $UDPServerRun directives are specified.
Thanks to Michael Biebl for helping to debug this one.
2009-05-12 12:03:00 +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
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
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
251e48a34c preparing for 4.1.7 2009-04-22 08:52:13 +02:00
Rainer Gerhards
9e99fa5812 Merge branch 'nextmaster' 2009-04-21 16:55:09 +02:00
Rainer Gerhards
88caccecf8 Merge branch 'master' into beta
Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
2009-04-21 16:54:05 +02:00
Rainer Gerhards
6e410a76f6 preparing for 3.22.0 (move to stable) 2009-04-21 16:49:46 +02:00
Rainer Gerhards
aa43d7f831 doc: added (hopefully) easier to grasp queue explanation 2009-04-21 16:32:33 +02:00
Rainer Gerhards
1fb5cee04d improved testbench - added tests for queue disk-only mode 2009-04-17 17:53:33 +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
9348f8b9c2 preparing for 4.3.0 release 2009-04-17 14:33:14 +02:00
Rainer Gerhards
3f6c6cff47 Merge branch 'master' into nextmaster 2009-04-17 14:21:52 +02:00
Rainer Gerhards
8e536c5b25 highlighted bugfix imported from beta 2009-04-17 14:21:22 +02:00
Rainer Gerhards
51d68bb9af Merge branch 'beta' 2009-04-17 14:21:02 +02:00
Rainer Gerhards
b408585416 highlighted bugfix imported from v2-stable 2009-04-17 14:20:25 +02:00
Rainer Gerhards
63d3982721 Merge branch 'v3-stable' into beta 2009-04-17 14:19:43 +02:00