| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|\
| |
| |
| |
| | |
Conflicts:
runtime/rsyslog.h
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
... hopefully removes false positives (but may cause some trouble
with hostname parsing). For details, see this bug tracker:
http://bugzilla.adiscon.com/show_bug.cgi?id=126
This patch is not optimal for v4 - another one will follow. The spirit
of this commit is to enable easier backporting if someone is interested
in doing so.
|
| |
| |
| |
| |
| | |
(made rsyslogd unusable in production). Occured if at least one queue
was in direct mode (the default for action queues).
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
tests for the various timestamp formats have been added
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
tools/omfile.c
|
| | |\ |
|
| | | |\ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
- 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
|
| | | | |
| | | | |
| | | | |
| | | | | |
stderr and stdo are now kept open across fork()
|
|\| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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 ;)).
|
| | | | |
| | | | |
| | | | |
| | | | | |
plus some cleanup...
|
| | | | |
| | | | |
| | | | |
| | | | | |
now contain a copy of the config line that (most likely) caused the error
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | | |
|
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
|\| | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
ChangeLog
runtime/rsyslog.h
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
(in addition to rather specific syslog tcp server)
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
sending n messages
New config directive $ActionSendUDPRebindInterval
added for the purpose. By default, rebinding is disabled. This is
considered useful for load balancers.
|
|\| | | |
|
| |\| | |
|
| | |\| |
|
| | | |
| | | |
| | | |
| | | | |
(testcase was only present in v4, so I did not spot the issue immediately)
|
| | |\|
| | | |
| | | |
| | | |
| | | | |
Conflicts:
ChangeLog
|
| | | |
| | | |
| | | |
| | | | |
... as well as some other minor issues.
|
| | | | |
|
|\| | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tests/Makefile.am
|
| |\| |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tests/Makefile.am
|
| | |\|
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tests/Makefile.am
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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]
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
...when rsyslogd ran in forked mode (as usual!)
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
specified.
Thanks to Michael Biebl for helping to debug this one.
|
| | | | |
|
|\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
|\| | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
|\| | | |
|
| | | | |
|
|\| | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
|\| | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
tests/Makefile.am
|
| | | | |
|