Miloslav Trmač
6861810b73
Don't run valgrind tests if imdiag is not enabled
...
Valgrind tests depend on imdiag as well.
2012-05-31 18:39:17 +02:00
Miloslav Trmač
c3efd63737
Add ylwrap to .gitignore
2012-05-31 18:37:07 +02:00
Rainer Gerhards
95d9202c09
bugfix: invalid free in imptcp could lead to abort during startup
2012-05-29 12:35:13 +02:00
Rainer Gerhards
6bc629021e
Merge branch 'v5-beta' into beta
...
Conflicts:
ChangeLog
2012-05-29 11:36:13 +02:00
Rainer Gerhards
f4ec11fa77
Merge branch 'v5-stable' into v5-beta
2012-05-29 11:23:04 +02:00
Tomas Heinrich
a4980cbde2
bugfix: if debug message could end up in log file when forking
...
if rsyslog was set to auto-background (thus fork, the default) and debug
mode to stdout was enabled, debug messages ended up in the first log file
opened. Currently, stdout logging is completely disabled in forking mode
(but writing to the debug log file is still possible). This is a change
in behaviour, which is under review. If it causes problems to you,
please let us know.
Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
2012-05-29 11:21:50 +02:00
Rainer Gerhards
5fa3c34a1f
preparing for 6.3.9 (beta) release
2012-05-22 11:00:53 +02:00
Rainer Gerhards
261fe8e6cd
tcpsrv: cleaned up patch, works now with multiple users as well
...
Note: "users" means modules, like imtcp and imdiag. NOT real users
or devices.
2012-05-18 08:59:08 +02:00
Rainer Gerhards
fa0a859d21
regression: tcpsrv.c always activated first worker, what lead to hang
...
... if more than 3 fds were to be read at the same time.
2012-05-16 18:30:40 +02:00
Rainer Gerhards
03e9a91731
bugfix: imtcp could cause hang during reception
...
this also applied to other users of core file tcpsrv.c, but imtcp was
by far the most prominent and widely-used, the rest rather exotic
(like imdiag)
NOTE: this patch is probably not 100% correct and may cause problems
if multiple tcpsrv.c users existing within a configuration. The next
step is to evaluate this and probably slightly change the worker thread
startup/shutdown location.
2012-05-16 16:39:27 +02:00
Rainer Gerhards
29897b90ce
minor issue: tcpsrv did not decrement wrkr cnt on shutdown
...
I am not really sure if that is an issue at all, at least it
is inconsistent.
2012-05-15 14:30:36 +02:00
Rainer Gerhards
131e581845
bugfix/omudpspoof: problems, including abort, happend when run on multiple threads.
...
Root cause is that libnet is not thread-safe. Omudpspoof now
guards libnet calls with their own mutex.
2012-05-14 09:05:38 +02:00
Rainer Gerhards
48b8ea8137
Merge branch 'v6-stable'
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
2012-05-10 14:58:07 +02:00
Rainer Gerhards
68f7a7bfd2
Merge branch 'v5-stable' into v6-stable
...
Conflicts:
ChangeLog
2012-05-10 14:54:19 +02:00
Rainer Gerhards
370bfa988d
Merge branch 'v5-stable' into v5-beta
...
Conflicts:
ChangeLog
2012-05-10 14:52:57 +02:00
Rainer Gerhards
184497d4cb
bugfix: disk queue was not persisted on shutdown, regression of fix to
...
http://bugzilla.adiscon.com/show_bug.cgi?id=299
The new code also handles the case of shutdown of blocking light and
full delayable sources somewhat smarter and permits, assuming sufficient
timouts, to persist message up to the max queue capacity. Also some nits
in debug instrumentation have been fixed.
2012-05-10 14:44:26 +02:00
Rainer Gerhards
3d8f446488
bugfix: disk queue was not persisted on shutdown, regression of fix to
...
http://bugzilla.adiscon.com/show_bug.cgi?id=299
The new code also handles the case of shutdown of blocking light and
full delayable sources somewhat smarter and permits, assuming sufficient
timouts, to persist message up to the max queue capacity. Also some nits
debug instrumentation have been fixed.
2012-05-10 14:39:25 +02:00
Rainer Gerhards
7f2b8c85db
preparing for 6.2.1
2012-05-10 10:28:41 +02:00
Rainer Gerhards
6625450cbe
Merge branch 'v5-beta'
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
2012-05-10 10:17:18 +02:00
Rainer Gerhards
e577d6bc79
Merge branch 'v5-stable' into v6-stable
...
Conflicts:
ChangeLog
2012-05-10 09:43:06 +02:00
Rainer Gerhards
b3d54ce6ff
Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-beta
2012-05-10 09:06:27 +02:00
Rainer Gerhards
3118b8e100
preparing for 5.9.7
2012-05-10 09:05:01 +02:00
Rainer Gerhards
24a81f9950
Merge branch 'v5-stable' into v5-beta
...
Conflicts:
ChangeLog
2012-05-10 08:23:12 +02:00
Rainer Gerhards
d86a212255
bugfix/tcpflood: sending small test files did not work correctly
2012-05-10 08:03:22 +02:00
Rainer Gerhards
af968e6ef9
cleanup: removing no longer needed macros
2012-05-04 09:30:47 +02:00
Rainer Gerhards
8ce2e39177
cleanup no longer used variable
2012-05-03 18:40:31 +02:00
Rainer Gerhards
e53ef769dd
Merge branch 'v6-stable'
...
Conflicts:
tools/syslogd.c
2012-05-03 18:33:29 +02:00
Rainer Gerhards
4f70113457
Merge branch 'v5-stable' into v6-stable
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
2012-05-03 18:28:54 +02:00
Rainer Gerhards
fdcaca6b85
Merge branch 'v5-stable' into v5-beta
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
2012-05-03 18:25:27 +02:00
Rainer Gerhards
99d9c6d52c
bugfix/omfile: template action parameter was not accepted
...
(and template name set to "??" if the parameter was used)
Thanks to Brian Knox for alerting us on this bug.
2012-05-03 18:21:46 +02:00
Rainer Gerhards
fe8ac119f7
preparing for 5.8.11 release
2012-05-03 14:52:09 +02:00
Rainer Gerhards
bec43b5380
ommysql: added support for new mysql_library_[init/exit]
2012-05-03 13:48:46 +02:00
Rainer Gerhards
a34e46801b
bugfix: ommysql did not properly init/exit the mysql runtime library
...
This could lead to segfaults. Triggering condition: multiple action
instances using ommysql. Thanks to Tomas Heinrich for reporting this
problem and providing an initial patch (which my solution is based on,
I need to add more code to clean the mess up).
2012-05-03 12:32:03 +02:00
Rainer Gerhards
6f529cc2da
bugfix: rsyslog did not terminate when delayable inputs were blocked
...
...due to unvailable sources. Fixes:
http://bugzilla.adiscon.com/show_bug.cgi?id=299
Thanks to Marcin M for bringing up this problem and Andre Lorbach
for helping to reproduce and fix it.
2012-05-03 09:53:48 +02:00
Rainer Gerhards
a4d9f6e70f
bugfix: inside queue.c, some thread cancel states were not correctly reset.
...
While this is a bug, we assume it did have no practical effect
because the reset as it was done was set to the state the code actually
had at this point. But better fix this...
2012-05-03 09:25:06 +02:00
Rainer Gerhards
8597affe15
debug: slightly improved debug info for input module startup
2012-05-03 08:49:05 +02:00
Rainer Gerhards
1d7ba92156
better debug instrumentation --> input thread names used for reporting
2012-05-02 16:01:13 +02:00
Rainer Gerhards
420189ba2f
bugfix: active input in "light delay state" could block rsyslog termination
...
at least for prolonged period of time...
2012-04-27 12:32:57 +02:00
Rainer Gerhards
fe50701280
cosmetic: new version in ChangeLog
2012-04-27 12:14:49 +02:00
Rainer Gerhards
9801893b29
Merge branch 'v5-stable-field-substring' into v5-beta
2012-04-27 09:55:11 +02:00
Rainer Gerhards
9c76723c5b
added capability to specify substrings for field extraction mode
2012-04-27 09:42:53 +02:00
Rainer Gerhards
45dc0db51e
Merge branch 'master-fieldext'
2012-04-26 16:03:30 +02:00
Rainer Gerhards
5624012710
added capability to specify substrings for field extraction mode
2012-04-26 15:50:49 +02:00
Rainer Gerhards
9ec02e670a
cleanup: removed unused but set parameters
2012-04-23 17:31:26 +02:00
Rainer Gerhards
f949f5c037
bugfix: omudpspoof did not work correctly if no spoof hostname was configured
2012-04-23 17:07:20 +02:00
Rainer Gerhards
feac49c13b
bugfix: number conversion in expression evaluation was not always correct
...
was invalid when the property was no string. Currently all props are
strings, so this bug never could hit in practice.
2012-04-23 16:54:08 +02:00
Rainer Gerhards
354a410fad
doc: correcting sample section of omudpspoof
...
again, credits to Jo Rhett for reporting this issue
2012-04-20 07:39:08 +02:00
Rainer Gerhards
4152e0a509
doc: omudpspoof doc had invalid directives
...
Thanks to Jo Rhett for reporting the bug.
2012-04-20 07:28:34 +02:00
Rainer Gerhards
9b06a4c264
Merge branch 'v5-beta'
...
Conflicts:
plugins/imptcp/imptcp.c
2012-04-19 18:16:40 +02:00
Rainer Gerhards
6e28d86c6a
Merge branch 'v5-stable' into v6-stable
2012-04-19 18:04:30 +02:00
