summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bugfix: made rsyslog compile when libestr ist not installed in /usrv6.3.10Rainer Gerhards2012-06-042-2/+8
| | | | Thanks to Miloslav Trmač for providing patches and suggestions
* cosmetic: removed autoconf warning messagesRainer Gerhards2012-06-041-4/+4
|
* preparing for 6.3.10Rainer Gerhards2012-06-043-3/+13
|
* Merge branch 'v6-stable' into betaRainer Gerhards2012-06-042-7/+10
|\
| * bugfix: --enable-smcustbindcdr configure directive did not workUltrabug2012-06-042-7/+10
| | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=330 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | Merge branch 'v6-stable' into betaRainer Gerhards2012-06-010-0/+0
|\|
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-06-017-16/+52
| |\
* | \ Merge branch 'v5-beta' into betaRainer Gerhards2012-06-014-13/+33
|\ \ \
| * | | doc: mentioning imported bugfix in ChangeLogRainer Gerhards2012-06-011-0/+7
| | | |
| * | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-014-13/+26
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: runtime/queue.c
| | * | some better code to handle queue congestionRainer Gerhards2012-06-011-10/+15
| | | | | | | | | | | | | | | | | | | | This is a minor optimization to spare some cycles if the timeout is set to immediate discard
| | * | bugfix: delayble source could block action queue, ...Rainer Gerhards2012-06-012-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | even if there was a disk queue associated with it. The root cause of this problem was that it makes no sense to delay messages once they arrive in the action queue - the "input" that is being held in that case is the main queue worker, what makes no sense. Thanks to Marcin for alerting us on this problem and providing instructions to reproduce it.
| | * | cosmetic: slightly improved debug outputRainer Gerhards2012-05-311-2/+2
| | | |
* | | | Skip tests that require root if euid != 0Miloslav Trmač2012-05-314-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | This will mark them as SKIPPED instead of FAILED, making it at least in theory possible to get 0 FAILED tests even when running as an unprivileged user.
* | | | Don't run valgrind tests if imdiag is not enabledMiloslav Trmač2012-05-311-2/+2
| | | | | | | | | | | | | | | | Valgrind tests depend on imdiag as well.
* | | | Add ylwrap to .gitignoreMiloslav Trmač2012-05-311-0/+1
| | | |
* | | | bugfix: invalid free in imptcp could lead to abort during startupRainer Gerhards2012-05-292-0/+3
| | | |
* | | | Merge branch 'v5-beta' into betaRainer Gerhards2012-05-295-4/+57
|\| | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-295-3/+27
| |\| |
| | * | bugfix: if debug message could end up in log file when forkingTomas Heinrich2012-05-294-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | bugfix/omudpspoof: problems, including abort, happend when run on multiple ↵Rainer Gerhards2012-05-142-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | threads. Root cause is that libnet is not thread-safe. Omudpspoof now guards libnet calls with their own mutex.
| * | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-101-0/+9
| |\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
| * | | bugfix: disk queue was not persisted on shutdown, regression of fix toRainer Gerhards2012-05-102-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | preparing for 6.3.9 (beta) releasev6.3.9Rainer Gerhards2012-05-223-3/+3
| | | |
* | | | tcpsrv: cleaned up patch, works now with multiple users as wellRainer Gerhards2012-05-181-7/+26
| | | | | | | | | | | | | | | | | | | | Note: "users" means modules, like imtcp and imdiag. NOT real users or devices.
* | | | regression: tcpsrv.c always activated first worker, what lead to hangRainer Gerhards2012-05-161-1/+1
| | | | | | | | | | | | | | | | ... if more than 3 fds were to be read at the same time.
* | | | bugfix: imtcp could cause hang during receptionRainer Gerhards2012-05-162-12/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | minor issue: tcpsrv did not decrement wrkr cnt on shutdownRainer Gerhards2012-05-151-1/+3
| | | | | | | | | | | | | | | | | | | | I am not really sure if that is an issue at all, at least it is inconsistent.
* | | | Merge branch 'v6-stable'Rainer Gerhards2012-05-102-12/+30
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-102-11/+19
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: ChangeLog
| | * | bugfix: disk queue was not persisted on shutdown, regression of fix toRainer Gerhards2012-05-102-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | preparing for 6.2.1v6.2.1Rainer Gerhards2012-05-103-3/+3
| | | |
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-104-16/+7
| |\| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog
* | | | Merge branch 'v5-beta'Rainer Gerhards2012-05-103-15/+6
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | Merge branch 'v5-beta' of git+ssh://git.adiscon.com/git/rsyslog into v5-betaRainer Gerhards2012-05-103-3/+3
| |\ \ \
| | * | | preparing for 5.9.7v5.9.7Rainer Gerhards2012-05-103-3/+3
| | | | |
| * | | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-103-15/+3
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| Conflicts: ChangeLog
| | * | bugfix/tcpflood: sending small test files did not work correctlyRainer Gerhards2012-05-102-2/+5
| | | |
| | * | cleanup: removing no longer needed macrosRainer Gerhards2012-05-042-14/+1
| | | |
| * | | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-05-035-9/+110
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | cosmetic: new version in ChangeLogRainer Gerhards2012-04-271-0/+2
| | | |
| * | | Merge branch 'v5-stable-field-substring' into v5-betaRainer Gerhards2012-04-276-73/+107
| |\ \ \
| | * | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-275-63/+97
| | | | |
* | | | | cleanup no longer used variableRainer Gerhards2012-05-031-1/+0
| | | | |
* | | | | Merge branch 'v6-stable'Rainer Gerhards2012-05-035-18/+129
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: tools/syslogd.c
| * | | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-05-036-19/+120
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| | * | | preparing for 5.8.11 releasev5.8.11Rainer Gerhards2012-05-033-3/+3
| | | | |
| | * | | ommysql: added support for new mysql_library_[init/exit]Rainer Gerhards2012-05-032-1/+27
| | | | |
| | * | | bugfix: ommysql did not properly init/exit the mysql runtime libraryRainer Gerhards2012-05-032-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| | * | | bugfix: rsyslog did not terminate when delayable inputs were blockedRainer Gerhards2012-05-032-5/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...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.