From 752e1c4b863346fe6eb8b6bc66d1d3bc3d346d13 Mon Sep 17 00:00:00 2001 From: Radu Gheorghe Date: Tue, 25 Jun 2013 18:34:23 +0300 Subject: added "required" parameters, fixed conf snippet, bolded defaults --- doc/imfile.html | 395 +++++++++++++++++++++++--------------------------------- 1 file changed, 165 insertions(+), 230 deletions(-) diff --git a/doc/imfile.html b/doc/imfile.html index 274d6e60..88f0d39f 100644 --- a/doc/imfile.html +++ b/doc/imfile.html @@ -1,218 +1,156 @@ - -Text File Input Monitor - -back - -

Text File Input Module

-

Module Name:    imfile

-

Author: Rainer Gerhards -<rgerhards@adiscon.com>

-

Description:

-

Provides the ability to convert any standard text file into -a syslog message. A standard -text file is a file consisting of printable characters with lines -being delimited by LF.

-

The file is read line-by-line and any line read is passed to -rsyslog's rule engine. The rule engine applies filter conditons and -selects which actions needs to be carried out. Empty lines are not -processed, as they would result in empty syslog records. They are simply -ignored.

-

As new lines are written they are taken from the file and -processed. Please note that this happens based on a polling interval -and not immediately. The file monitor support file rotation. To fully -work, rsyslogd must run while the file is rotated. Then, any remaining -lines from the old file are read and processed and when done with that, -the new file is being processed from the beginning. If rsyslogd is -stopped during rotation, the new file is read, but any not-yet-reported -lines from the previous file can no longer be obtained.

-

When rsyslogd is stopped while monitoring a text file, it -records the last processed location and continues to work from there -upon restart. So no data is lost during a restart (except, as noted -above, if the file is rotated just in this very moment).

-

Currently, the file must have a fixed name and location -(directory). It is planned to add support for dynamically generating -file names in the future.

-

Multiple files may be monitored by specifying -$InputRunFileMonitor multiple times. -

- -

Configuration Directives:

-

Module Directives

- - -

Action Directives

- -Caveats/Known Bugs: -

So far, only 100 files can be monitored. If more are needed, -the source needs to be patched. See define MAX_INPUT_FILES in imfile.c

Powertop -users may want to notice that imfile utilizes polling. Thus, it is no -good citizen when it comes to conserving system power consumption. We -are currently evaluating to move to inotify(). However, there are a -number of subtle issues, which needs to be worked out first. We will -make the change as soon as we can. If you can afford it, we recommend -using a long polling interval in the mean time. -

-

Sample:

-

The following sample monitors two files. If you need just one, -remove the second one. If you need more, add them according to the -sample ;). This code must be placed in /etc/rsyslog.conf (or wherever -your distro puts rsyslog's config files). Note that only commands -actually needed need to be specified. The second file uses less -commands and uses defaults instead.
-

- - - -

Legacy Configuration Directives:

- -Caveats/Known Bugs: -

So far, only 100 files can be monitored. If more are needed, -the source needs to be patched. See define MAX_INPUT_FILES in imfile.c

Powertop -users may want to notice that imfile utilizes polling. Thus, it is no -good citizen when it comes to conserving system power consumption. We -are currently evaluating to move to inotify(). However, there are a -number of subtle issues, which needs to be worked out first. We will -make the change as soon as we can. If you can afford it, we recommend -using a long polling interval in the mean time. -

-

Sample:

-

The following sample monitors two files. If you need just one, -remove the second one. If you need more, add them according to the -sample ;). This code must be placed in /etc/rsyslog.conf (or wherever -your distro puts rsyslog's config files). Note that only commands -actually needed need to be specified. The second file uses less -commands and uses defaults instead.
-

-

+

+ Legacy Configuration Directives:

+ +

+ Caveats/Known Bugs:

+

+ So far, only 100 files can be monitored. If more are needed, the source needs to be patched. See define MAX_INPUT_FILES in imfile.c

+

+ Powertop users may want to notice that imfile utilizes polling. Thus, it is no good citizen when it comes to conserving system power consumption. We are currently evaluating to move to inotify(). However, there are a number of subtle issues, which needs to be worked out first. We will make the change as soon as we can. If you can afford it, we recommend using a long polling interval in the mean time.

+

+ Sample:

+

+ The following sample monitors two files. If you need just one, remove the second one. If you need more, add them according to the sample ;). This code must be placed in /etc/rsyslog.conf (or wherever your distro puts rsyslog's config files). Note that only commands actually needed need to be specified. The second file uses less commands and uses defaults instead.

+

+ -

[rsyslog.conf overview] -[manual index] [rsyslog site]

-

This documentation is part of the -rsyslog project.
-Copyright © 2008 by Rainer -Gerhards and Adiscon. -Released under the GNU GPL version 3 or higher.

- +# File 2 +$InputFileName /path/to/file2 +$InputFileTag tag2: +$InputFileStateFile stat-file2 +$InputRunFileMonitor +# ... and so on ... # +# check for new lines every 10 seconds +$InputFilePollingInterval 10

+

+ [rsyslog.conf overview] [manual index] [rsyslog site]

+

+ This documentation is part of the rsyslog project.
+ Copyright © 2008 by Rainer Gerhards and Adiscon. Released under the GNU GPL version 3 or higher.

+ + -- cgit v1.2.3 From 50fc430ccd4305645007327c31026fb4e12fc6f5 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 27 Jun 2013 15:14:09 +0200 Subject: bugfix: in RFC5425 TLS, multiple wildcards in auth could cause segfault --- ChangeLog | 1 + runtime/net.c | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index e675e589..cb93bda0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ --------------------------------------------------------------------------- Version 7.4.2 [v7.4-stable] 2013-06-?? +- bugfix: in RFC5425 TLS, multiple wildcards in auth could cause segfault - bugfix: RainerScript object required parameters were not properly checked - this clould result to segfaults on startup if parameters were missing. diff --git a/runtime/net.c b/runtime/net.c index b291213e..13391cc0 100644 --- a/runtime/net.c +++ b/runtime/net.c @@ -232,6 +232,7 @@ finalize_it: /* enqueue the element */ if(pPeer->pWildcardRoot == NULL) { pPeer->pWildcardRoot = pNew; + pPeer->pWildcardLast = pNew; } else { pPeer->pWildcardLast->pNext = pNew; } -- cgit v1.2.3