| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| | |
Conflicts:
runtime/rsyslog.h
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This was a complex manual merge, especially in action.c. So if
there occur some problems, this would be a good point to start
troubleshooting. I run a couple of tests before commiting and
they all went well.
Conflicts:
action.c
action.h
runtime/queue.c
runtime/queue.h
runtime/wti.c
runtime/wti.h
|
| | |
| |
| |
| |
| | |
WARNING: currently, message repeation processing is disabled, must
be reenabled (but prefer to do some other tests first)
|
| | | |
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Note that this was NOT a trivial merge, and there may be
some issues. This needs to be seen when we continue developing.
Conflicts:
runtime/msg.h
runtime/obj.h
runtime/queue.c
runtime/srUtils.h
runtime/stream.c
runtime/stream.h
runtime/wti.c
tests/Makefile.am
tools/omfile.c
tools/syslogd.c
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
ChangeLog
runtime/msg.h
tcps_sess.c
tcpsrv.c
tools/syslogd.c
|
| | | |
| | |
| | |
| | |
| | | |
... as well as some cleanup (some commented-out code is left to
support UxTradMsg again is someone really complains ;)).
|
| | | |
| | |
| | |
| | |
| | |
| | | |
- saved gettimeofday() calls in imtcp (and increased reception buffer)
- somewhat optimized stringbuf.c
- some other optimizations
|
| | | |
| | |
| | |
| | |
| | | |
...by now using lowres time and thus saving many time() calls. This needs
some performance testing and must be made configurable if it works out.
|
| | | |
| | |
| | |
| | | |
... as well as added multi-ruleset support for imtcp
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
... by moving code to stream.c. Thanks to the new design, new cases are
not really needed, resulting in cleaner code.
I also did a cleanup of header file usage as a side-activity.
|
| | | | |
|
| | |/
| |
| |
| |
| |
| | |
... 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)
|
| |\|
| |
| |
| |
| |
| | |
Conflicts:
ChangeLog
runtime/rsyslog.h
|
| | |
| |
| |
| |
| |
| | |
... this provides some basic support to integrate extensions that
are not direct parts of rsyslog to be built during its build
process.
|
| |\| |
|
| | | |
|
| |\| |
|
| | |\ |
|
| | | |\
| | | |
| | | |
| | | |
| | | | |
Conflicts:
ChangeLog
|
| | | | |
| | | |
| | | |
| | | | |
... as well as some other minor issues.
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tests/Makefile.am
|
| | |\| |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tests/Makefile.am
|
| | | |\|
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tests/Makefile.am
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
specified.
Thanks to Michael Biebl for helping to debug this one.
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
... in preparation for some larger changes - I need to apply some
serious design changes, as the current system does not play well
at all with ultra-reliable queues. Will do that in a totally new version.
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
... and now make check fails again, we have obviously found some new
bugs thanks to the additional cases
|
| |\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tests/Makefile.am
tests/diskqueue.sh
tests/imtcp-multiport.sh
tests/manytcp.sh
tests/memq-persist.sh
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| |\| | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tests/Makefile.am
tests/diskqueue.sh
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
which enables to talk to the rsyslog core at runtime. The current
implementation is only a beginning, but can be expanded over time
|
| |\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
runtime/rsyslog.h
tests/Makefile.am
tools/syslogd.c
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
imdiag was never finished (not even really begun), but now I need it.
I made the few things that are available compile, but more serious
work is required.
|
| | | | | |
|
| |\| | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
runtime/rsyslog.h
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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).
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| | | | |
| | | |
| | | |
| | | | |
code is not complete, error cases are not handled.
|
| |/ / /
| | |
| | |
| | |
| | | |
... plus simplifying free() calls after agreement on mailing list
that we no longer need to check if the pointer is non-NULL
|
| | | |
| | |
| | |
| | |
| | | |
... mostly removal of compile-time warnings (thanks to Michael
Biebl for suggesting to look after that)
|
| | | |
| | |
| | |
| | |
| | |
| | | |
removed some warning in imklog compilation, but may not have
solved a lurking issue (but placed comment so that we know if
something surfaces)
|
| |\| | |
|
| | |\| |
|
