Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v6-stable' into tmp | Rainer Gerhards | 2012-11-22 | 1 | -0/+2 |
|\ | |||||
| * | bugfix: hostname set in rsyslog.conf was not picked up until HUP | oxpa | 2012-11-22 | 1 | -0/+2 |
| | | | | | | | | which could also mean "never" or "not for a very long time". | ||||
* | | bugfix: invalid formatting of man page | bjarniig@rhi.hi.is | 2012-11-14 | 1 | -4/+4 |
| | | |||||
* | | Fix the rsyslogd man page formatting for the -d flag | Georgi Georgiev | 2012-11-14 | 1 | -1/+1 |
| | | | | | | | | | | The indentation around the "-d" flag description is in the wrong place and does not display properly. | ||||
* | | enabled to build without libuuid, at loss of uuid functionality | Rainer Gerhards | 2012-11-09 | 1 | -0/+5 |
| | | | | | | | | | | | | this enables smoother builds on older systems that do not support libuuid. Loss of functionality should usually not matter too much as uuid support has only recently been added and is very seldom used. | ||||
* | | Merge branch 'v6-stable' into v7-stable | Rainer Gerhards | 2012-11-01 | 2 | -2/+2 |
|\| | |||||
| * | bugfix: invalid rsyslog-internal macro API use | Rainer Gerhards | 2012-11-01 | 2 | -2/+2 |
| | | | | | | | | | | This had no bad effect, because the macro did the same as the one that should have been used. | ||||
| * | bugfix: build problems on some platforms | Rainer Gerhards | 2012-10-26 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'v6-stable' into v6-beta | Rainer Gerhards | 2012-10-17 | 2 | -38/+9 |
| |\ | |||||
| * | | fix small memory leak when template is specified in omfile | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-10-04 | 1 | -2/+1 |
| |\ \ | |||||
* | | | | bugfix: omfwd did not properly support "template" parameter | Rainer Gerhards | 2012-10-30 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | We also added a testbench test to check for this in the future. That in turn required new testbench tools. | ||||
* | | | | add -D rsyslogd option to enable config parser debug mode | Rainer Gerhards | 2012-10-27 | 2 | -1/+13 |
| | | | | |||||
* | | | | prepare for 7.20 stable release & minor thingsv7.2.0 | Rainer Gerhards | 2012-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | The most important real code chane is the initialization of the epoll control set. This should just be cosmetic (valgrind warnings), as all data we actually use already was properly initialized. | ||||
* | | | | disable deprecated warnings in omdiscard/omruleset | Rainer Gerhards | 2012-10-22 | 1 | -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 manpage | Rainer Gerhards | 2012-10-22 | 1 | -8/+1 |
| | | | | | | | | | | | | | | | | | | | | Thanks to Michael Biebl for mentioning this. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=364 | ||||
* | | | | build: Drop unused CNF_LIBS variable | Michael Biebl | 2012-10-18 | 1 | -2/+2 |
| | | | | |||||
* | | | | doc: typo fix | Rainer Gerhards | 2012-10-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-16 | 2 | -38/+9 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: rsyslog.service.in | ||||
| * | | | cleanup: removed remains of -c option (compatibility mode) | Rainer Gerhards | 2012-10-16 | 2 | -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 | ||||
* | | | add deprecated note to discard action | Rainer Gerhards | 2012-10-11 | 1 | -1/+7 |
| | | | |||||
* | | | fix double-free | Rainer Gerhards | 2012-10-11 | 1 | -1/+1 |
| | | | |||||
* | | | fix small memory leak when template is specified in omfile | Rainer Gerhards | 2012-10-11 | 1 | -0/+1 |
| | | | |||||
* | | | cosmetic cleanup | Rainer Gerhards | 2012-10-09 | 1 | -3/+1 |
| | | | |||||
* | | | Merge branch 'v6-stable' into beta | Rainer Gerhards | 2012-10-04 | 1 | -2/+1 |
|\| | | | | | | | | | | | | | | Conflicts: plugins/cust1/Makefile.am | ||||
| * | | build: don't include librsyslog.la in the dist tarball | Michael Biebl | 2012-10-04 | 1 | -2/+1 |
| | | | | | | | | | | | | libtool archives are not meant to be shipped in the source tarball. | ||||
| * | | bugfix: config validation run did not always return correct return state | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-10-02 | 2 | -0/+468 |
|\ \ \ | | |/ | |/| | |||||
| * | | integrate logctl into build process | Rainer Gerhards | 2012-10-02 | 2 | -456/+468 |
| | | | |||||
| * | | add new tool "logctl" to access lumberjack logs in MongoDB | Ulrike Gerhards | 2012-10-02 | 1 | -0/+456 |
| | | | |||||
* | | | Merge branch 'v6-devel' | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
|\| | | |||||
| * | | bugfix: config validation run did not always return correct return state | Rainer Gerhards | 2012-09-20 | 1 | -0/+1 |
| | | | |||||
* | | | bugfix: omfile action did not respect "template" parameter | Rainer Gerhards | 2012-09-19 | 1 | -1/+3 |
| | | | | | | | | | | | | ... and used default template in all cases | ||||
* | | | correct library link order | Rainer Gerhards | 2012-09-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Thanks to Evgeny Turnaev for alerting us on the problem and providing hits to the solution. | ||||
* | | | Merge branch 'master' into master-newruleset | Rainer Gerhards | 2012-09-06 | 2 | -1/+11 |
|\| | | | | | | | | | | | | | | Conflicts: runtime/rsconf.c | ||||
| * | | Merge branch 'v6-stable' into v6-devel | Rainer Gerhards | 2012-09-06 | 2 | -1/+11 |
| |\| | |||||
| | * | Fixed TCP CheckConnection handling in omfwd.c. | Andre Lorbach | 2012-08-25 | 1 | -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 handling | Rainer Gerhards | 2012-08-28 | 1 | -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 code | Rainer Gerhards | 2012-08-25 | 1 | -10/+0 |
| | | | |||||
* | | | new ruleengine: some cleanup | Rainer Gerhards | 2012-09-06 | 1 | -5/+0 |
|/ / | |||||
* | | add uuid property to message object | Jérôme Renard | 2012-08-26 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'v6-stable' | Rainer Gerhards | 2012-08-25 | 2 | -25/+72 |
|\| | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c | ||||
| * | Merge branch 'v5-stable' into v6-stable | Rainer Gerhards | 2012-08-25 | 2 | -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-beta | Rainer Gerhards | 2012-08-22 | 1 | -4/+59 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: runtime/ruleset.c | ||||
| | | * | bugfix: multiple main queues with same queue file name were not detected | Rainer Gerhards | 2012-08-22 | 1 | -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/RSFALSE | Rainer Gerhards | 2012-08-22 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | This is done to prevent name claches with libraries. | ||||
| | * | | Merge branch 'v5-stable' into v5-beta | Rainer Gerhards | 2012-06-15 | 1 | -0/+1 |
| | |\ \ | |||||
| * | \ \ | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2012-08-20 | 1 | -3/+19 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | bugfix: potential abort if output plugin logged message during shutdown | Rainer Gerhards | 2012-08-01 | 1 | -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 modules | Rainer Gerhards | 2012-06-12 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | Thanks to bodik for reporting this bug. --------------------------------------------- |