Rainer Gerhards
9e8556538a
Merge branch 'v4-beta' into beta
2009-12-04 13:20:13 +01:00
Rainer Gerhards
ad58b9c8fb
Merge branch 'v4-beta' into v4-devel
...
Conflicts:
ChangeLog
2009-12-04 13:15:24 +01:00
Rainer Gerhards
a65f638523
Merge branch 'v4-stable' into v4-beta
2009-12-04 13:14:14 +01:00
Rainer Gerhards
44ee165390
Merge branch 'v3-stable' into v4-stable
2009-12-04 13:13:12 +01:00
Rainer Gerhards
8021912232
bugfix: potential segfault when -p command line option was used
...
thanks to varmojfekoj for pointing me at this bug
2009-12-04 13:11:50 +01:00
Rainer Gerhards
113915eb9d
worked around an issue where omfile failed to compile on32 bit platforms
...
under some circumstances (this smells like a gcc problem, but a simple
solution was available). Thanks to Kenneth Marshall for some advice.
2009-12-02 17:04:04 +01:00
Rainer Gerhards
8b9132bc32
Merge branch 'beta'
2009-11-30 12:03:17 +01:00
Rainer Gerhards
d695383cd6
Merge branch 'v5-stable' into beta
2009-11-30 12:02:27 +01:00
Rainer Gerhards
5a0bd837e9
Merge branch 'v4-stable' into v5-stable
...
Conflicts:
doc/rsyslog_conf_modules.html
2009-11-30 12:01:53 +01:00
Rainer Gerhards
c3f07d9dda
Merge branch 'v4-beta' into v4-devel
2009-11-30 11:57:49 +01:00
Rainer Gerhards
4cc7a7c16c
Merge branch 'v4-stable' into v4-beta
2009-11-30 11:51:32 +01:00
Rainer Gerhards
cf1275d846
Merge branch 'v3-stable' into v4-stable
2009-11-30 11:51:20 +01:00
Rainer Gerhards
7b40604e9a
bugfix: $CreateDirs variable not properly initialized
...
default thus was random (but most often "on")
2009-11-30 11:50:57 +01:00
Jonathan Bond-Caron
549ed00c4a
added $EscapeControlCharacterTab config directive
2009-11-27 10:30:47 +01:00
Rainer Gerhards
1f48ed19f3
Merge branch 'v4-beta' into beta
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/rsyslog_conf_modules.html
tests/Makefile.am
tests/sndrcv_drvr.sh
2009-11-25 19:13:30 +01:00
Rainer Gerhards
c21d381030
Merge branch 'beta'
...
Conflicts:
ChangeLog
2009-11-25 14:53:20 +01:00
Rainer Gerhards
4e3589857a
Merge branch 'v4-devel' into tmp
...
Conflicts:
ChangeLog
tests/Makefile.am
tests/sndrcv_drvr.sh
tools/syslogd.c
2009-11-20 18:51:25 +01:00
Rainer Gerhards
5b55ab75e2
debugondemand mode caused backgrounding to fail
...
This is close to a bug, but I'd consider the ability to background
in this mode a new feature...
2009-11-20 18:41:04 +01:00
Rainer Gerhards
35fa257f37
bugfix: omfile output was only written when buffer was full
...
... not at end of transaction.
2009-11-18 14:27:04 +01:00
Rainer Gerhards
0957820a10
Merge branch 'v4-devel'
...
Conflicts:
doc/rsyslog_conf_modules.html
gss-misc.c
plugins/imgssapi/imgssapi.c
plugins/imudp/imudp.c
plugins/imuxsock/imuxsock.c
runtime/glbl.c
runtime/glbl.h
runtime/net.c
2009-11-17 10:38:46 +01:00
Rainer Gerhards
f868d6a17a
Merge branch 'v4-beta' into v4-devel
2009-11-17 09:41:19 +01:00
Rainer Gerhards
2a1d97263f
Merge branch 'v4-stable' into v4-beta
2009-11-17 09:41:00 +01:00
Rainer Gerhards
d8b3669e6d
Merge branch 'v3-stable' into v4-stable
...
Conflicts:
doc/rsyslog_conf.html
runtime/net.c
2009-11-17 09:40:43 +01:00
Rainer Gerhards
f94a3034b6
integrating varmojfekoj's "unlimited select()" patch into v4-devel
2009-11-17 09:10:24 +01:00
varmojfekoj
30c2e42ec3
added option to use unlimited-size select() calls
...
Thanks to varmjofekoj for the patch
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2009-11-17 09:00:01 +01:00
Rainer Gerhards
8c29f28435
moved DNS resolution code out of imudp and into the backend processing
...
Most importantly, DNS resolution now never happens if the resolved name
is not required. Note that this applies to imudp - for the other inputs,
DNS resolution almost comes for free, so we do not do it there. However,
the new method has been implemented in a generic way and as such may
also be used by other modules in the future.
2009-11-17 08:11:31 +01:00
Rainer Gerhards
8b246de2a5
some light performance enhancement
...
...by replacing time() call with much faster (at least under linux)
gettimeofday() calls.
2009-11-12 17:12:10 +01:00
Rainer Gerhards
3173f27821
Merge branch 'v4-devel'
2009-11-12 14:49:37 +01:00
Rainer Gerhards
3391af97b4
Merge branch 'v4-stable' into v5-stable
2009-11-12 14:48:08 +01:00
Rainer Gerhards
2194f86fdd
Merge branch 'v4-beta' into v4-devel
2009-11-12 14:47:10 +01:00
Rainer Gerhards
8aec830cf5
Merge branch 'v4-stable' into v4-beta
2009-11-12 14:46:58 +01:00
Rainer Gerhards
f6dfcc7c3d
correcting -q/-Q patch - was invalid
...
This is the correct patch. The previous one solved the segfault, but
disabled the -q/Q options.
2009-11-12 14:21:53 +01:00
Rainer Gerhards
bedc903ae0
Merge branch 'v3-stable' into v4-stable
2009-11-12 14:10:00 +01:00
Rainer Gerhards
e4542eb926
bugfix: segfault on startup when -q or -Q option was given
...
bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=157
Thanks to Jonas Nogueira for reporting this bug.
2009-11-12 14:07:12 +01:00
Rainer Gerhards
2dafb35077
some module cleanup
2009-11-12 12:03:27 +01:00
Rainer Gerhards
b24ea47ea2
some improvement of omfile performance with dynafiles
...
saved costly time() calls by employing a logical clock, which is
sufficient for the use case
2009-11-10 14:36:23 +01:00
Rainer Gerhards
2d232617fa
Merge branch 'v4-beta' into v4-devel
...
Conflicts:
ChangeLog
2009-11-10 13:51:16 +01:00
Rainer Gerhards
384de6a442
Merge branch 'v4-beta'
...
Conflicts:
ChangeLog
2009-11-10 12:53:04 +01:00
Rainer Gerhards
2b5e15d549
added a so-called "On Demand Debug" mode
...
in which debug output can be generated only after the process has started,
but not right from the beginning. This is assumed to be useful for
hard-to-find bugs. Also improved the doc on the debug system.
2009-11-10 12:50:48 +01:00
Rainer Gerhards
4578dc6a2d
Merge branch 'v4-devel' into tmp
2009-11-05 14:34:21 +01:00
Rainer Gerhards
cd5f653ad8
Merge branch 'v4-beta' into v4-devel
...
Conflicts:
tests/Makefile.am
2009-11-05 14:34:08 +01:00
Rainer Gerhards
a5cd509be7
bugfix: named pipes did no longer work (they always got an open error)
...
this was a regression from the omfile rewrite in 4.5.0
2009-11-05 12:44:57 +01:00
Rainer Gerhards
aa2e8ea15b
first complete implementation of loadable parser system
...
I have now done the necessary cleanup. Looks like everything is in place.
Unfortunately, I do not yet have any actual parser that is not built-in,
but I think we can postpone working on that when the first one appears.
I don't expect troubles in that case, but you never know ;)
2009-11-04 15:34:31 +01:00
Rainer Gerhards
ef661fe13c
finalized parser module calling interface
...
looks like we are almost done and need only to add the ruleset parser-specific
config options.
2009-11-04 11:33:09 +01:00
Rainer Gerhards
1b7f5c5468
moved rfc3164/5424 code to new parser modules
...
another milestone commit: the program works, the new interface
is used, some more cleanup is needed and the per-ruleset config
options are still missing. But we are getting closer...
2009-11-04 10:40:27 +01:00
Rainer Gerhards
b41e0d51f5
some more cleanup along the way
...
... getting the module structure a bit cleaner ;)
2009-11-03 18:48:40 +01:00
Rainer Gerhards
b1db196953
one step closer to dynamically loadable parsers
...
This is a milestone commit, which adds new code that breaks
nothing, but also does not add any visible change. Just prep work...
2009-11-03 18:44:02 +01:00
Rainer Gerhards
6f511cecfa
more cleanup and working towards a parser module calling interface
...
I cleaned up a lot of config variable access along the way. This
version compiles and runs, but does not yet offer any enhanced
functionality. pmrfc5424 is just a dummy that is not yet being used.
2009-11-03 12:39:48 +01:00
Rainer Gerhards
7d78b3bdfd
restructured parser part of rsyslog
...
now cleaner and hopefully usuable as a basis for loadable parser
modules. I also cleaned up/consolidated some of the internal
message generation functionality in rsyslogd.
2009-11-03 10:41:47 +01:00
Rainer Gerhards
f291d5c570
ruleset queue setting was not honored during multi-submit
2009-11-03 10:08:17 +01:00