summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* re-enable deprecated warings for omdiscard/omrulesetRainer Gerhards2012-10-221-4/+0
| | | | merge for action list functionality will follow soon
* Merge branch 'beta'Rainer Gerhards2012-10-222-8/+5
|\
| * disable deprecated warnings in omdiscard/omrulesetRainer Gerhards2012-10-221-0/+4
| | | | | | | | | | | | | | | | | | ... because action-like statements in action lists are not supported in 7.1. This will be available in 7.3, but it is too late to do this in 7.1. So we disable the warnings and re-enable them in 7.3. Functionality- wise, this is no problem at all as the legacy constructs are still fully supported. Thanks to forum user "canadaboy" for mentioning this problem.
| * doc: remove BSD blocks from rsyslog.conf manpageRainer Gerhards2012-10-221-8/+1
| | | | | | | | | | Thanks to Michael Biebl for mentioning this. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=364
* | Merge branch 'beta'Rainer Gerhards2012-10-182-3/+3
|\| | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * build: Drop unused CNF_LIBS variableMichael Biebl2012-10-181-2/+2
| |
| * doc: typo fixRainer Gerhards2012-10-171-1/+1
| |
* | Merge branch 'beta'Rainer Gerhards2012-10-162-38/+9
|\| | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * Merge branch 'v6-stable' into betaRainer Gerhards2012-10-162-38/+9
| |\ | | | | | | | | | | | | Conflicts: rsyslog.service.in
| | * cleanup: removed remains of -c option (compatibility mode)Rainer Gerhards2012-10-162-38/+9
| | | | | | | | | | | | | | | | | | both from code & doc and emitted warning message if still used closes: http://bugzilla.adiscon.com/show_bug.cgi?id=361 Thanks to Michael Biebl for reporting & suggestions
* | | Merge branch 'beta'Rainer Gerhards2012-10-112-2/+8
|\| | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | add deprecated note to discard actionRainer Gerhards2012-10-111-1/+7
| | |
| * | fix double-freeRainer Gerhards2012-10-111-1/+1
| | |
| * | fix small memory leak when template is specified in omfileRainer Gerhards2012-10-111-0/+1
| | |
* | | Merge branch 'v6-devel'Rainer Gerhards2012-10-111-0/+1
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: template.c
| * | | fix small memory leak when template is specified in omfileRainer Gerhards2012-10-111-0/+1
| | | |
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-10-041-2/+1
| |\ \ \ | | | |/ | | |/|
* | | | Merge branch 'beta'Rainer Gerhards2012-10-101-3/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html
| * | | cosmetic cleanupRainer Gerhards2012-10-091-3/+1
| | | |
* | | | Merge branch 'c1-streamzip' into master-streamzipRainer Gerhards2012-10-051-3/+12
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/rsyslog_conf_global.html runtime/stream.c tools/omfile.c
| * | | improved omfile zip writer to increase compressionRainer Gerhards2012-09-141-0/+8
| | | | | | | | | | | | | | | | | | | | This was achieved by somewhat reducing the robustness of the zip archive. This is controlled by the new setting $OMFileVeryReliableZip.
* | | | Merge branch 'v6-stable' into betaRainer Gerhards2012-10-041-2/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: plugins/cust1/Makefile.am
| * | | build: don't include librsyslog.la in the dist tarballMichael Biebl2012-10-041-2/+1
| | | | | | | | | | | | | | | | libtool archives are not meant to be shipped in the source tarball.
| * | | bugfix: config validation run did not always return correct return stateRainer Gerhards2012-09-201-0/+1
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-10-022-0/+468
|\ \ \ \ | | |_|/ | |/| |
| * | | integrate logctl into build processRainer Gerhards2012-10-022-456/+468
| | | |
| * | | add new tool "logctl" to access lumberjack logs in MongoDBUlrike Gerhards2012-10-021-0/+456
| | | |
* | | | Merge branch 'v6-devel'Rainer Gerhards2012-09-201-0/+1
|\| | |
| * | | bugfix: config validation run did not always return correct return stateRainer Gerhards2012-09-201-0/+1
| | | |
* | | | bugfix: omfile action did not respect "template" parameterRainer Gerhards2012-09-191-1/+3
| | | | | | | | | | | | | | | | ... and used default template in all cases
* | | | correct library link orderRainer Gerhards2012-09-111-1/+1
| | | | | | | | | | | | | | | | | | | | Thanks to Evgeny Turnaev for alerting us on the problem and providing hits to the solution.
* | | | Merge branch 'master' into master-newrulesetRainer Gerhards2012-09-062-1/+11
|\| | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsconf.c
| * | | Merge branch 'v6-stable' into v6-develRainer Gerhards2012-09-062-1/+11
| |\| |
| | * | Fixed TCP CheckConnection handling in omfwd.c.Andre Lorbach2012-08-251-1/+10
| | | | | | | | | | | | | | | | Interface needed to be changed in lower stream classes. Syslog TCP Sending is now resumed properly.
| | * | bugfix: omusrsmsg incorrect return state & config warning handlingRainer Gerhards2012-08-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During config file processing, Omusrmsg often incorrectly returned a warning status, even when no warning was present (caused by uninitialized variable). Also, the core handled warning messages incorrectly, and treated them as errors. As a result, omusrmsg (most often) could not properly be loaded. Note that this only occurs with legacy config action syntax. This was a regression caused by an incorrect merge in to the 6.3.x codebase. Thanks to Stefano Mason for alerting us of this bug.
| | * | cleanup: remove left-over commented-out codeRainer Gerhards2012-08-251-10/+0
| | | |
* | | | new ruleengine: some cleanupRainer Gerhards2012-09-061-5/+0
|/ / /
* | | add uuid property to message objectJérôme Renard2012-08-261-1/+1
| | |
* | | Merge branch 'v6-stable'Rainer Gerhards2012-08-252-25/+72
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c
| * | Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-252-22/+71
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html runtime/ruleset.c template.h threads.c tools/syslogd.c
| | * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-08-221-4/+59
| | |\| | | | | | | | | | | | | | | | | Conflicts: runtime/ruleset.c
| | | * bugfix: multiple main queues with same queue file name were not detectedRainer Gerhards2012-08-221-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | This lead to queue file corruption. While the root cause is a config error, it is a bug that this important and hard to find config error was not detected by rsyslog.
| | * | changed TRUE/FALSE to RSTRUE/RSFALSERainer Gerhards2012-08-221-3/+3
| | | | | | | | | | | | | | | | This is done to prevent name claches with libraries.
| | * | Merge branch 'v5-stable' into v5-betaRainer Gerhards2012-06-151-0/+1
| | |\ \
| * | \ \ Merge branch 'v5-stable' into betaRainer Gerhards2012-08-201-3/+19
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | bugfix: potential abort if output plugin logged message during shutdownRainer Gerhards2012-08-011-3/+19
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | note that none of the rsyslog-provided plugins does this Thanks to bodik and Rohit Prasad for alerting us on this bug and analyzing it. fixes: http://bugzilla.adiscon.com/show_bug.cgi?id=347
| | * | bugfix "$PreserveFQDN on" was not honored in some modulesRainer Gerhards2012-06-121-0/+1
| | | | | | | | | | | | | | | | | | | | Thanks to bodik for reporting this bug. ---------------------------------------------
* | | | Merge branch 'beta'Rainer Gerhards2012-06-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h
| * | | Merge branch 'master-elasticsearch' into tmpRainer Gerhards2012-06-291-1/+1
| |\ \ \
| | * | | omelasticsearch: added transactional interface & better debug outputRainer Gerhards2012-05-241-1/+1
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 13:18:21 +0000