summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| | * | | bugfix: inside queue.c, some thread cancel states were not correctly reset.Rainer Gerhards2012-05-032-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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...
| | * | | debug: slightly improved debug info for input module startupRainer Gerhards2012-05-031-0/+1
| | | | |
| | * | | bugfix: active input in "light delay state" could block rsyslog terminationRainer Gerhards2012-04-272-0/+6
| | | |/ | | |/| | | | | | | | | at least for prolonged period of time...
| | * | doc: correcting sample section of omudpspoofRainer Gerhards2012-04-201-8/+8
| | | | | | | | | | | | | | | | again, credits to Jo Rhett for reporting this issue
| | * | doc: omudpspoof doc had invalid directivesRainer Gerhards2012-04-201-2/+2
| | | | | | | | | | | | | | | | Thanks to Jo Rhett for reporting the bug.
| * | | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-04-192-2/+4
| |\| |
* | | | bugfix/omfile: template action parameter was not acceptedRainer Gerhards2012-05-032-1/+4
| | | | | | | | | | | | | | | | | | | | (and template name set to "??" if the parameter was used) Thanks to Brian Knox for alerting us on this bug.
* | | | better debug instrumentation --> input thread names used for reportingRainer Gerhards2012-05-023-8/+32
| | | |
* | | | Merge branch 'master-fieldext'Rainer Gerhards2012-04-265-63/+97
|\ \ \ \
| * | | | added capability to specify substrings for field extraction modeRainer Gerhards2012-04-265-63/+97
| | | | |
* | | | | cleanup: removed unused but set parametersRainer Gerhards2012-04-235-10/+4
| | | | |
* | | | | bugfix: omudpspoof did not work correctly if no spoof hostname was configuredRainer Gerhards2012-04-232-1/+3
| | | | |
* | | | | bugfix: number conversion in expression evaluation was not always correctRainer Gerhards2012-04-231-2/+4
|/ / / / | | | | | | | | | | | | | | | | was invalid when the property was no string. Currently all props are strings, so this bug never could hit in practice.
* | | | Merge branch 'v5-beta'Rainer Gerhards2012-04-191-0/+4
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: plugins/imptcp/imptcp.c
| * | | Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-192-2/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| | * \ \ Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-191-0/+2
| | |\ \ \ | | | | |/ | | | |/|
| | | * | doc: added last bugfix to ChangeLogRainer Gerhards2012-04-191-0/+2
| | | | |
| | | * | bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix: imptcp input name could not be set config directive was accepted, but had no effect
| | * | | doc: add last bugfix to changelogRainer Gerhards2012-04-192-1/+3
| | | | | | | | | | | | | | | | | | | | and bump up version
| | * | | bugfix: imptcp input name could not be setRainer Gerhards2012-04-191-2/+2
| | | | | | | | | | | | | | | | | | | | config directive was accepted, but had no effect
| * | | | Merge branch 'v5-stable-newstats' into v5-betaRainer Gerhards2012-04-184-5/+45
| |\| | |
| | * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-180-0/+0
| | |\| |
| | * | | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-04-184-5/+45
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/msg.c