| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
ChangeLog
action.h
configure.ac
doc/manual.html
plugins/immark/immark.c
plugins/impstats/impstats.c
plugins/imptcp/imptcp.c
plugins/imtcp/imtcp.c
runtime/cfsysline.c
runtime/cfsysline.h
runtime/conf.c
runtime/ctok.c
runtime/ctok.h
runtime/ctok_token.c
runtime/ctok_token.h
runtime/dnscache.h
runtime/expr.c
runtime/expr.h
runtime/rule.c
runtime/rule.h
runtime/ruleset.h
runtime/sysvar.c
runtime/vm.h
runtime/vmop.c
runtime/vmop.h
runtime/vmprg.c
runtime/vmprg.h
runtime/vmstk.c
runtime/vmstk.h
tools/omusrmsg.c
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
plugins/imfile/imfile.c
plugins/omtesting/omtesting.c
tcpsrv.c
threads.c
|
| | | |
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
NOTE: this merge has problems, to be fixed with follow-up commits
If file creation fails due to out of memory, we can enter a tight loop.
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/parser.c
runtime/rsyslog.h
tests/Makefile.am
tests/tcpflood.c
|
| | |\ |
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
runtime/cfsysline.c
tools/ompipe.c
|
| | | |/
| | |/| |
|
| | | | |
|
| | | | |
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
tools/omfile.c
|
| |/ / / |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
too many dependencies, things get cluttered (and merging probably
gets problematic). Now new config will be "conf2".
|
| | | | |
|
|\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/omlibdbi/omlibdbi.c
tests/Makefile.am
tests/diag.sh
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The capability has been added for module to specify that they do not
like being unloaded.
related bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=222
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
|
|\| | | |
|
| |\| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
configure.ac
runtime/cfsysline.c
tools/ompipe.c
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
config variables were not properly initialized
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | | |
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).
|
|\ \ \
| | |/
| |/|
| | |
| | | |
Conflicts:
runtime/msg.h
|
| | | |
|
|/ / |
|
|/ |
|
|
|
|
|
|
|
|
|
| |
This was not honored by the new ompipe module, because it is a local
file directive (it was applied to pipes as a side-effect of using the
same module for pipes and files...). I now made this a global, so that
semantics are the same as previously. Not really nice, but probably
the best thing to do in the current situation (everything else would
involve much more overhead --- leave that for the new config system).
|
| |
|
|
... based on old omfile. Michael Biebl reported that xconsole seems
to have some issues with the new pipe code, so it was best to use
the old code for pipes. The optimizations were done to speed up file
access, so it doesn't really matter pipes do not receive them.
|