Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | regression fix: config validation code affected by recent changes | Rainer Gerhards | 2011-05-30 | 1 | -5/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | did not return with proper return value | |||||
* | | | | | | | | | | Merge branch 'beta' | Rainer Gerhards | 2011-05-21 | 3 | -1/+22 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imrelp/imrelp.c | |||||
| * | | | | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-05-20 | 1 | -1/+5 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf_modules.html plugins/imrelp/imrelp.c | |||||
| | * | | | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-05-11 | 1 | -1/+5 | |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: runtime/queue.c | |||||
| | | * | | | | | | | bugfix: invalid processing in QUEUE_FULL condition | Rainer Gerhards | 2011-05-11 | 1 | -2/+6 | |
| | | | |_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the the multi-submit interface was used and a QUEUE_FULL condition occured, the failed message was properly destructed. However, the rest of the input batch, if it existed, was not processed. So this lead to potential loss of messages and a memory leak. The potential loss of messages was IMHO minor, because they would have been dropped in most cases due to the queue remaining full, but very few lucky ones from the batch may have made it. Anyhow, this has now been changed so that the rest of the batch is properly tried to be enqueued and, if not possible, destructed. | |||||
| * | | | | | | | | Merge branch 'v5-stable' into beta | Rainer Gerhards | 2011-05-09 | 3 | -2/+21 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/omfwd.c | |||||
| | * | | | | | | | bugfix: $LocalHostName was not honored under all circumstances | Rainer Gerhards | 2011-05-09 | 1 | -0/+6 | |
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=258 | |||||
| | * | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-05-03 | 1 | -0/+11 | |
| | |\| | | | | | ||||||
| | | * | | | | | bugfix: memory and file descriptor leak in stream processing | Rainer Gerhards | 2011-05-03 | 1 | -0/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leaks could occur under some circumstances if the file stream handler errored out during the open call. Among others, this could cause very big memory leaks if there were a problem with unreadable disk queue files. In regard to the memory leak, this closes: http://bugzilla.adiscon.com/show_bug.cgi?id=256 | |||||
* | | | | | | | | regression fix: activation for legacy modules handled incorrectly | Rainer Gerhards | 2011-05-12 | 1 | -0/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | step: imuxsock changed to new config system | Rainer Gerhards | 2011-05-12 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now also properly works with privilege drop | |||||
* | | | | | | | | step: imtcp did not properly handle privilege drop | Rainer Gerhards | 2011-05-06 | 2 | -4/+4 | |
| | | | | | | | | ||||||
* | | | | | | | | step: conf interface now natively supports priv drop | Rainer Gerhards | 2011-05-06 | 4 | -15/+84 | |
| | | | | | | | | ||||||
* | | | | | | | | step: generalized new config interface for all module types | Rainer Gerhards | 2011-05-06 | 4 | -35/+68 | |
| | | | | | | | | ||||||
* | | | | | | | | step: imtcp moved to new config interface | Rainer Gerhards | 2011-05-05 | 4 | -1/+71 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as far as we know that new interface right now ;) | |||||
* | | | | | | | | step: imudp utilizes interim new input module interface | Rainer Gerhards | 2011-05-04 | 5 | -4/+11 | |
| | | | | | | | | ||||||
* | | | | | | | | step: small improvements to input mod config plumbing | Rainer Gerhards | 2011-05-03 | 2 | -6/+11 | |
| | | | | | | | | ||||||
* | | | | | | | | step: put plumbing in place for new input module config system | Rainer Gerhards | 2011-05-03 | 6 | -53/+258 | |
| | | | | | | | | ||||||
* | | | | | | | | step: action queues now activated only AFTER privilege drop | Rainer Gerhards | 2011-05-02 | 1 | -0/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'v5-stable' | Rainer Gerhards | 2011-05-02 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | Merge branch 'v4-stable' into v5-stable | Rainer Gerhards | 2011-05-02 | 1 | -2/+4 | |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | |_|_|/ / / | |/| | | | | | Conflicts: tcpsrv.c | |||||
| | * | | | | | slightly more informative errmsg when TCP connection is aborted | Rainer Gerhards | 2011-05-02 | 1 | -2/+4 | |
| | | | | | | | ||||||
| | * | | | | | bugfix: abort if imfile reads file line of more than 64KiB | Rainer Gerhards | 2011-02-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Peter Eisentraut for reporting and analysing this problem. bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=221 | |||||
* | | | | | | | step: moved main message queue activation to after priv drop | Rainer Gerhards | 2011-04-27 | 1 | -0/+21 | |
| | | | | | | | ||||||
* | | | | | | | minor: some better debug instrumentation | Rainer Gerhards | 2011-04-27 | 1 | -2/+4 | |
| | | | | | | | ||||||
* | | | | | | | step: config-specific module list used during config processing | Rainer Gerhards | 2011-04-27 | 4 | -28/+39 | |
| | | | | | | | ||||||
* | | | | | | | step: added config-specific module list | Rainer Gerhards | 2011-04-27 | 7 | -51/+158 | |
| | | | | | | | ||||||
* | | | | | | | step: $ModLoad handler no longe requries conf obj | Rainer Gerhards | 2011-04-27 | 5 | -17/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | re-doing the interface, global var "loadConf" now holds that data. Makes things simpler with legacy handler, as well as new functionality. | |||||
* | | | | | | | step: shuffled module-related code from syslogd.c to rsconf.c | Rainer Gerhards | 2011-04-27 | 2 | -1/+174 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... plus some minor cleanup/code shuffle | |||||
* | | | | | | | step: outchannel list integrated into main config object | Rainer Gerhards | 2011-04-26 | 3 | -0/+11 | |
| | | | | | | | ||||||
* | | | | | | | step: moved config validation code | Rainer Gerhards | 2011-04-26 | 1 | -9/+33 | |
| | | | | | | | ||||||
* | | | | | | | shuffled even more config code from syslgod to config handler | Rainer Gerhards | 2011-04-26 | 2 | -3/+115 | |
| | | | | | | | ||||||
* | | | | | | | step: config handler setting from syslogd.c moved to rsconf.c | Rainer Gerhards | 2011-04-21 | 8 | -15/+437 | |
| | | | | | | | ||||||
* | | | | | | | step: begun to create a "load" interface in rsconf | Rainer Gerhards | 2011-04-21 | 2 | -2/+137 | |
| | | | | | | | ||||||
* | | | | | | | step: slowly migrating config settings... ;) | Rainer Gerhards | 2011-04-19 | 5 | -4/+85 | |
| | | | | | | | ||||||
* | | | | | | | some more work was required on the ruleset modification | Rainer Gerhards | 2011-04-19 | 5 | -29/+40 | |
| | | | | | | | ||||||
* | | | | | | | milestone: ruleset now supports rsconf_t | Rainer Gerhards | 2011-04-19 | 7 | -63/+83 | |
| | | | | | | | ||||||
* | | | | | | | milestone: conf obj interface now utilzes rsconf_t | Rainer Gerhards | 2011-04-19 | 4 | -30/+39 | |
| | | | | | | | ||||||
* | | | | | | | milestone: templates are now in config object | Rainer Gerhards | 2011-04-19 | 7 | -1/+184 | |
| | | | | | | | ||||||
* | | | | | | | renaming conf.* wasn't a good idea -- undoing | Rainer Gerhards | 2011-04-19 | 6 | -8/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 6 | -8/+8 | |
| |_|/ / / / |/| | | | | | ||||||
* | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-04-15 | 3 | -5/+21 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/impstats/impstats.c | |||||
| * | | | | | bugfix: $myhostname not available in RainerScript (and no error message) | Rainer Gerhards | 2011-04-14 | 3 | -5/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | closes: http://bugzilla.adiscon.com/show_bug.cgi?id=233 | |||||
* | | | | | | bugfix (kind of): memory leak with tcp reception epoll handler | Rainer Gerhards | 2011-04-13 | 1 | -2/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was an extremely unlikely leak and, if it happend, quite small. Still it is better to handle this border case. | |||||
* | | | | | | added log classification capabilities (via mmnormalize & tags) | Rainer Gerhards | 2011-04-13 | 1 | -16/+13 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-04-12 | 2 | -117/+119 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html plugins/imtcp/imtcp.c | |||||
| * | | | | | cleanup: initially thought temporary debug message made durable ;) | Rainer Gerhards | 2011-04-12 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has proven to be very valuable, so now it is properly formatted inside the source. | |||||
| * | | | | | bugfix: race condition in deferred name resolution | Rainer Gerhards | 2011-04-08 | 1 | -115/+117 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that this actually is a very small change, but I needed to shuffle a lot of code around in order to make it compile (due to required define order...). | |||||
* | | | | | | Merge branch 'v5-devel' | Rainer Gerhards | 2011-03-31 | 4 | -3/+17 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html doc/rsyslog_conf.html runtime/msg.c runtime/rsyslog.h template.c | |||||
| * | | | | | stop adding data to DA queue when low watermark has been reached | Rainer Gerhards | 2011-03-30 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | potentially closes: http://bugzilla.adiscon.com/show_bug.cgi?id=241 But needs more verification. |