summaryrefslogtreecommitdiffstats
path: root/runtime/conf.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into v5-develRainer Gerhards2011-10-211-1/+1
|\ | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h
| * bugfix: missing whitespace after property-based filter was not detectedRainer Gerhards2011-10-211-1/+1
| |
* | added capability to emit config error location info for warningsRainer Gerhards2011-08-091-5/+26
| | | | | | | | | | otherwise, omusrmsg's warning about new config format was not accompanied by problem location.
* | cosmetic: reformatted some codeRainer Gerhards2011-06-301-12/+5
|/ | | | so that more fits on a single screen --> useful for analysis
* bugfix: unitialized variable could cause issues under extreme conditionsRainer Gerhards2010-12-161-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!)
* Merge branch 'v4-devel' into masterRainer Gerhards2010-08-051-1/+1
|\ | | | | | | | | Conflicts: ChangeLog
| * Merge branch 'v3-stable' into v4-stableRainer Gerhards2010-08-051-1/+1
| |\ | | | | | | | | | | | | Conflicts: runtime/conf.c
| | * program name filter ! in the configuration cannot be resetKiss Gabor (Bitman)2010-08-051-2/+1
| | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | Merge branch 'v4-beta' into betaRainer Gerhards2010-02-041-3/+5
|\| |
| * | Merge branch 'v4-stable' into v4-betaRainer Gerhards2010-02-041-3/+5
| |\ \
| | * | bugfix: several smaller bugs resolved after flexelint reviewvarmojfekoj2010-02-041-3/+5
| | | | | | | | | | | | | | | | Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | | Merge branch 'v4-beta' into betaRainer Gerhards2010-01-261-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/queue.c
| * | | bugfix: blanks inside file names did not terminate file name parsing.Rainer Gerhards2010-01-191-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 rulesetRainer Gerhards2009-10-191-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.cRainer Gerhards2009-10-191-7/+15
| | | |
* | | | some mild restart-type HUP cleanupRainer Gerhards2009-07-151-17/+1
| | | | | | | | | | | | | | | | | | | | ... only those things that were obvious (and puzzled people looking at the code without konwing the subtle issues of HUP ;)).
* | | | Merge branch 'master' into v5-develRainer Gerhards2009-06-261-1/+9
|\| | | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| * | | optimization: propert names are now internally identified by integersRainer Gerhards2009-06-261-1/+9
| | | |
* | | | Merge branch 'omfile' into tmpRainer Gerhards2009-06-221-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a complex manual merge, especially in action.c. So if there occur some problems, this would be a good point to start troubleshooting. I run a couple of tests before commiting and they all went well. Conflicts: action.c action.h runtime/queue.c runtime/queue.h runtime/wti.c runtime/wti.h
| * | | Merge branch 'master' into newmsgRainer Gerhards2009-06-181-1/+1
| |\| | | | | | | | | | | | | | | | | | Conflicts: tools/omfile.c
| | * | Merge branch 'beta'Rainer Gerhards2009-06-181-1/+1
| | |\ \
| | | * | Merge branch 'v3-stable' into betaRainer Gerhards2009-06-181-1/+1
| | | |\|
| | | | * some minor bugfixesRainer Gerhards2009-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bugfix: invalid error message issued if $inlcudeConfig was on an empty set of files (e.g. *.conf, where none such files existed) thanks to Michael Biebl for reporting this bug - bugfix: when run in foreground (but not in debug mode), a debug message ("DoDie called") was emitted at shutdown. Removed. thanks to Michael Biebl for reporting this bug - bugfix: some garbagge was emitted to stderr on shutdown. This garbage consisted of file names, which were written during startup (key point: not a pointer error) thanks to Michael Biebl for reporting this bug - bugfix: startup and shutdown message were emitted to stdout thanks to Michael Biebl for reporting this bug
* | | | | Merge branch 'omfile' into v5-develRainer Gerhards2009-06-161-72/+85
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that this was NOT a trivial merge, and there may be some issues. This needs to be seen when we continue developing. Conflicts: runtime/msg.h runtime/obj.h runtime/queue.c runtime/srUtils.h runtime/stream.c runtime/stream.h runtime/wti.c tests/Makefile.am tools/omfile.c tools/syslogd.c
| * | | | Merge branch 'master' into omfileRainer Gerhards2009-06-161-22/+18
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/msg.h tcps_sess.c tcpsrv.c tools/syslogd.c
| | * | | done various optimizations to the stringbuf and its usersRainer Gerhards2009-06-161-22/+18
| | | | |
| * | | | completed multi-ruleset core supportRainer Gerhards2009-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | ... as well as added multi-ruleset support for imtcp
| * | | | fixed abort when emergency configuration was activatedRainer Gerhards2009-06-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | this regression was introduced last friday, so this is *NOT* present in any released version.
| * | | | improved config error messagesRainer Gerhards2009-06-121-4/+12
| | | | | | | | | | | | | | | | | | | | now contain a copy of the config line that (most likely) caused the error
| * | | | added $Ruleset config commandRainer Gerhards2009-06-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so we now can define multiple rule sets, we just can not use them ;) That means we have the foundation to bind listeners to different rule sets.
| * | | | restructered code in perparation for multiple rule set supportRainer Gerhards2009-06-101-46/+56
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | ... this was long overdue, and I finlly tackeld it. It turned out to be more complex than I initially thought. The next step now probably is to actually implement multiple rule sets and the beauty that comes with them.
* | | | Merge branch 'master' into v5-develRainer Gerhards2009-06-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog runtime/rsyslog.h
| * | | Merge branch 'beta'Rainer Gerhards2009-05-291-1/+1
| |\| | | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| | * | Merge branch 'v3-stable' into betaRainer Gerhards2009-05-291-1/+1
| | |\| | | | | | | | | | | | | | | | | Conflicts: runtime/rsyslog.h
| | | * fixed a regression of yesterday's patchRainer Gerhards2009-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | ... I know I should not have done this to a stable branch... Thankfully nothing was yet released.
* | | | Merge branch 'master' into v5-develRainer Gerhards2009-05-281-0/+6
|\| | | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| * | | Merge branch 'beta' into masterRainer Gerhards2009-05-281-0/+6
| |\| | | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| | * | Merge branch 'v3-stable' into betaRainer Gerhards2009-05-281-0/+6
| | |\| | | | | | | | | | | | | | | | | Conflicts: tests/Makefile.am
| | | * small enhancement: config validation run now exits with code 1 if an error ↵Rainer Gerhards2009-05-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is detected. This change is considered important but small enough to apply it directly to the stable version. [But it is a border case, the change requires more code than I had hoped. Thus I have NOT tried to actually catch all cases, this is left for the current devel releases, if necessary]
* | | | first shot at action state machine implemention (untested)Rainer Gerhards2009-05-071-1/+1
|/ / / | | | | | | | | | | | | I am commiting it so that the code is visible, but will no begin with the test environment.
* / / initial work on omprog, an output module to send messages to another programRainer Gerhards2009-04-011-1/+0
|/ /
* | initial implementation of RainerScript functions & strlen()Rainer Gerhards2009-03-101-0/+4
| | | | | | | | | | | | | | | | | | | | - implemented function support in RainerScript. That means the engine parses and compile functions, as well as executes a few build-in ones. Dynamic loading and registration of functions is not yet supported - but we now have a good foundation to do that later on. NOTE: nested function calls are not yet supported due to a design issue with the function call VM instruction set design. - implemented the strlen() RainerScript function
* | integrated various patches for solarisRainer Gerhards2009-03-051-1/+6
| | | | | | | | | | | | | | | | | | Unfortunatley, I do not have the full list of contributors available. The patch set was compiled by Ben Taylor, and I made some further changes to adopt it to the news rsyslog branch. Others provided much of the base work, but I can not find the names of the original authors. If you happen to be one of them, please let me know so that I can give proper credits.
* | added ERE support in filter conditionsRainer Gerhards2009-03-041-0/+2
|/ | | | new comparison operation "ereregex"
* Merge branch 'beta'Rainer Gerhards2008-10-161-3/+3
|\ | | | | | | | | | | Conflicts: ChangeLog
| * increased maximum size of a configuration statement to 4K (was 1K)Rainer Gerhards2008-10-161-3/+3
| |
* | removed compile time fixed message size limit (was 2K)Rainer Gerhards2008-09-021-6/+7
| | | | | | | | | | The limit can now be set via $MaxMessageSize global config directive (finally gotten rid of MAXLINE ;))
* | added testbed for config errors and fixed a bugRainer Gerhards2008-07-291-2/+10
| | | | | | | | | | | | - bugfix: no error was reported if the target of a $IncludeConfig could not be accessed. - added testbed for common config errors
* | enhanced configuration file error reporting and verificationRainer Gerhards2008-07-291-0/+33
|/ | | | | | | | | | | | - enhanced config file checking - no active actions are detected - added -N rsyslogd command line option for a config validation run (which does not execute actual syslogd code and does not interfere with a running instance) - somewhat improved emergency configuration. It is now also selected if the config contains no active actions - rsyslogd error messages are now reported to stderr by default. can be turned off by the new "$ErrorMessagesToStderr off" directive Thanks to HKS for suggesting these new features.
* Merge branch 'beta'Rainer Gerhards2008-07-011-9/+6
| | | | | | | | | | | | | | | Conflicts: ChangeLog conf.c doc/Makefile.am doc/manual.html omfwd.c plugins/omgssapi/omgssapi.c This was a bit hard to merge; if there are problems, they may be in the area of the new "comment in action line" code that came from the beta.
generated by cgit (git 2.34.1) at 2024-11-16 03:06:08 +0000