Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'beta' | Rainer Gerhards | 2012-01-09 | 1 | -0/+5 |
|\ | | | | | | | | | | | Conflicts: ChangeLog doc/v6compatibility.html | ||||
| * | removing $Begin, $End, $StrictScoping directives | Rainer Gerhards | 2012-01-09 | 1 | -0/+5 |
| | | | | | | | | | | | | v6.4 will provide the same functionality in a far better way. So we do not want to clutter the code. ------------------------- | ||||
| * | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-10-21 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html | ||||
* | \ | Merge branch 'v5-devel' | Rainer Gerhards | 2011-10-21 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| * \ \ | Merge branch 'v5-stable' into v5-devel | Rainer Gerhards | 2011-10-21 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| | * | | bugfix: missing whitespace after property-based filter was not detected | Rainer Gerhards | 2011-10-21 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-09-26 | 1 | -0/+7 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/conf.c tools/omfile.c tools/omusrmsg.c | ||||
| * | | | added capability to emit config error location info for warnings | Rainer Gerhards | 2011-08-09 | 1 | -5/+26 |
| | | | | | | | | | | | | | | | | | | | | otherwise, omusrmsg's warning about new config format was not accompanied by problem location. | ||||
* | | | | milestone: generic action parameters parsed via new config system | Rainer Gerhards | 2011-08-01 | 1 | -1/+2 |
| | | | | |||||
* | | | | milestone: queue object now has a param handler for new conf interface | Rainer Gerhards | 2011-07-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | ... and action queue defs use this new interface (but not yet the main queues) | ||||
* | | | | milestone: done plumbing to call plugin create action instance entry point | Rainer Gerhards | 2011-07-20 | 1 | -40/+0 |
| | | | | |||||
* | | | | milestone: added module config names | Rainer Gerhards | 2011-07-20 | 1 | -81/+0 |
| | | | | |||||
* | | | | Merge branch 'master-newconf' | Rainer Gerhards | 2011-07-12 | 1 | -365/+23 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tools/omfile.c | ||||
| * | | | | more cleanup, working on emergency config system | Rainer Gerhards | 2011-07-11 | 1 | -2/+5 |
| | | | | | |||||
| * | | | | more cleanup | Rainer Gerhards | 2011-07-11 | 1 | -8/+0 |
| | | | | | |||||
| * | | | | cleanup, removing now unused code | Rainer Gerhards | 2011-07-11 | 1 | -83/+0 |
| | | | | | |||||
| * | | | | cleaup & emergency config system reactivated | Rainer Gerhards | 2011-07-09 | 1 | -257/+0 |
| | | | | | |||||
| * | | | | milestone/[PARTWORK]: integrted script filter, but var access is missing | Rainer Gerhards | 2011-07-07 | 1 | -3/+7 |
| | | | | | |||||
| * | | | | milestone:/[PARTWORK]: config is processed using new parser, except... | Rainer Gerhards | 2011-07-06 | 1 | -16/+15 |
| | | | | | | | | | | | | | | | | | | | | ... for "if" filters (more work to come, probably lots of more work... ;)) | ||||
* | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-07-11 | 1 | -12/+5 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h | ||||
| * / / | cosmetic: reformatted some code | Rainer Gerhards | 2011-06-30 | 1 | -12/+5 |
| |/ / | | | | | | | | | | so that more fits on a single screen --> useful for analysis | ||||
* | | | step: put plumbing in place for new input module config system | Rainer Gerhards | 2011-05-03 | 1 | -16/+18 |
| | | | |||||
* | | | step: config-specific module list used during config processing | Rainer Gerhards | 2011-04-27 | 1 | -4/+4 |
| | | | |||||
* | | | step: added config-specific module list | Rainer Gerhards | 2011-04-27 | 1 | -1/+1 |
| | | | |||||
* | | | step: $ModLoad handler no longe requries conf obj | Rainer Gerhards | 2011-04-27 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | re-doing the interface, global var "loadConf" now holds that data. Makes things simpler with legacy handler, as well as new functionality. | ||||
* | | | step: config handler setting from syslogd.c moved to rsconf.c | Rainer Gerhards | 2011-04-21 | 1 | -3/+3 |
| | | | |||||
* | | | some more work was required on the ruleset modification | Rainer Gerhards | 2011-04-19 | 1 | -1/+1 |
| | | | |||||
* | | | milestone: ruleset now supports rsconf_t | Rainer Gerhards | 2011-04-19 | 1 | -8/+7 |
| | | | |||||
* | | | milestone: conf obj interface now utilzes rsconf_t | Rainer Gerhards | 2011-04-19 | 1 | -22/+22 |
| | | | |||||
* | | | milestone: templates are now in config object | Rainer Gerhards | 2011-04-19 | 1 | -1/+1 |
| | | | |||||
* | | | renaming conf.* wasn't a good idea -- undoing | Rainer Gerhards | 2011-04-19 | 1 | -0/+1453 |
| | | | | | | | | | | | | | | | too many dependencies, things get cluttered (and merging probably gets problematic). Now new config will be "conf2". | ||||
* | | | renamed conf.c to legacyconf.c to make room for new config system | Rainer Gerhards | 2011-04-19 | 1 | -1453/+0 |
| |/ |/| | |||||
* | | Merge branch 'v5-devel' | Rainer Gerhards | 2010-12-17 | 1 | -1/+6 |
|\| | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c plugins/imudp/imudp.c runtime/glbl.c | ||||
| * | bugfix: unitialized variable could cause issues under extreme conditions | Rainer Gerhards | 2010-12-16 | 1 | -1/+6 |
| | | | | | | | | | | | | plus some minor nits. This was found after a clang static code analyzer analysis (great tool, and special thanks to Marcin for telling me about it!) | ||||
* | | milestone: added support for CEE-properties in property-based filters | Rainer Gerhards | 2010-12-01 | 1 | -7/+20 |
| | | |||||
* | | Merge branch 'master' into newconf | Rainer Gerhards | 2010-08-05 | 1 | -1/+1 |
|\| | | | | | | | | | Conflicts: doc/manual.html | ||||
| * | Merge branch 'v4-devel' into master | Rainer Gerhards | 2010-08-05 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | Conflicts: ChangeLog | ||||
| | * | Merge branch 'v3-stable' into v4-stable | Rainer Gerhards | 2010-08-05 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: runtime/conf.c | ||||
| | | * | program name filter ! in the configuration cannot be reset | Kiss Gabor (Bitman) | 2010-08-05 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | final (?) milestone: looks like action scoping works now | Rainer Gerhards | 2010-07-27 | 1 | -1/+34 |
| | | | | | | | | | | | | | | | | but doc and testing is missing! | ||||
* | | | | added support to save/restore rsyslog core action settings... | Rainer Gerhards | 2010-07-23 | 1 | -1/+19 |
| | | | | | | | | | | | | | | | | | | | | ... but not those of plugins (which are at least as important as the core ones). So this is an interim commit. | ||||
* | | | | first shot at scoping (for actions only) | Rainer Gerhards | 2010-07-23 | 1 | -1/+93 |
|/ / / | | | | | | | | | | | | | parser now supports $Begin action, $End action, $StrictScoping, but not yet the actual semantics. | ||||
* | | | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2010-02-04 | 1 | -3/+5 |
|\| | | |||||
| * | | Merge branch 'v4-stable' into v4-beta | Rainer Gerhards | 2010-02-04 | 1 | -3/+5 |
| |\ \ | |||||
| | * | | bugfix: several smaller bugs resolved after flexelint review | varmojfekoj | 2010-02-04 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com> | ||||
* | | | | Merge branch 'v4-beta' into beta | Rainer Gerhards | 2010-01-26 | 1 | -1/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/queue.c | ||||
| * | | | bugfix: blanks inside file names did not terminate file name parsing. | Rainer Gerhards | 2010-01-19 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | This could reslult in the whole rest of a line (including comments) to be treated as file name in "write to file" actions. Thanks to Jack for reporting this issue. | ||||
* | | | | bugfix: first UDP listener was incorrectly assigned its ruleset | Rainer Gerhards | 2009-10-19 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | this was a regression of the recent imudp multi-ruleset enhancement bug was not in any released version | ||||
* | | | | cleanup: finally moved some config variables just to conf.c | Rainer Gerhards | 2009-10-19 | 1 | -7/+15 |
| | | | | |||||
* | | | | some mild restart-type HUP cleanup | Rainer Gerhards | 2009-07-15 | 1 | -17/+1 |
| | | | | | | | | | | | | | | | | | | | | ... only those things that were obvious (and puzzled people looking at the code without konwing the subtle issues of HUP ;)). |