mirror of
https://github.com/rsyslog/rsyslog.git
synced 2025-12-20 08:30:42 +01:00
Merge branch 'beta'
Conflicts: ChangeLog configure.ac doc/manual.html doc/v6compatibility.html
This commit is contained in:
Rainer Gerhards
commit
272f0a5b3d
18
ChangeLog
18
ChangeLog
@ -5,6 +5,9 @@ Version 6.3.7 [DEVEL] 2011-0?-??
|
||||
- bugfix: facility local<x> was not correctly interpreted in legacy filters
|
||||
Was only accepted if it was the first PRI in a multi-filter PRI.
|
||||
Thanks to forum user Mark for bringing this to our attention.
|
||||
- bugfix: potential abort after reading invalid X.509 certificate
|
||||
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290
|
||||
Thanks to Tomas Heinrich for the patch
|
||||
- bugfix: race condition when extracting program name, APPNAME, structured
|
||||
data and PROCID (RFC5424 fields) could lead to invalid characters e.g.
|
||||
in dynamic file names or during forwarding (general malfunction of these
|
||||
@ -17,6 +20,9 @@ Version 6.3.7 [DEVEL] 2011-0?-??
|
||||
rule engine as omfile could not really recover.
|
||||
- bugfix: rsyslogd -v always said 64 atomics were not present
|
||||
thanks to mono_matsuko for the patch
|
||||
- bugfix: potential abort after reading invalid X.509 certificate
|
||||
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290
|
||||
Thanks to Tomas Heinrich for the patch
|
||||
---------------------------------------------------------------------------
|
||||
Version 6.3.6 [DEVEL] 2011-09-19
|
||||
- added $InputRELPServerBindRuleset directive to specify rulesets for RELP
|
||||
@ -86,6 +92,8 @@ Version 6.3.0 [DEVEL] (rgerhards), 2011-06-01
|
||||
http://blog.gerhards.net/2011/06/new-rsyslog-config-system-materializes.html
|
||||
---------------------------------------------------------------------------
|
||||
Version 6.2.0 [v6-stable], 2011-0?-??
|
||||
- bugfix (kind of): removed numerical part from pri-text
|
||||
see v6 compatibility document for reasons
|
||||
- bugfix: race condition when extracting program name, APPNAME, structured
|
||||
data and PROCID (RFC5424 fields) could lead to invalid characters e.g.
|
||||
in dynamic file names or during forwarding (general malfunction of these
|
||||
@ -404,6 +412,11 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-06-08
|
||||
affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on
|
||||
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=236
|
||||
---------------------------------------------------------------------------
|
||||
Version 5.8.7 [V5-stable] 2011-??-??
|
||||
- bugfix: potential abort after reading invalid X.509 certificate
|
||||
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290
|
||||
Thanks to Tomas Heinrich for the patch
|
||||
---------------------------------------------------------------------------
|
||||
Version 5.8.6 [V5-stable] 2011-10-21
|
||||
- bugfix: missing whitespace after property-based filter was not detected
|
||||
- bugfix: $OMFileFlushInterval period was doubled - now using correct value
|
||||
@ -1245,12 +1258,15 @@ increase.
|
||||
- increased ompgsql performance by adapting to new transactional
|
||||
output module interface
|
||||
---------------------------------------------------------------------------
|
||||
Version 4.8.1 [v4-beta], 2011-09-??
|
||||
Version 4.8.1 [v4-stable], 2011-09-??
|
||||
- bugfix: $ActionExecOnlyOnce interval did not work properly
|
||||
Thanks to Tomas Heinrich for the patch
|
||||
- bugfix: potential abort if ultra-large file io buffers are used and
|
||||
dynafile cache exhausts address space (primarily a problem on 32 bit
|
||||
platforms)
|
||||
- bugfix: potential abort after reading invalid X.509 certificate
|
||||
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=290
|
||||
Thanks to Tomas Heinrich for the patch
|
||||
---------------------------------------------------------------------------
|
||||
Version 4.8.0 [v4-stable] (rgerhards), 2011-09-07
|
||||
***************************************************************************
|
||||
|
||||
@ -65,8 +65,7 @@ BSD syslogd. For example, when TAG is "named[12345]", programname is
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b>pri-text</b></td>
|
||||
<td>the PRI part of the message in a textual form with the numerical PRI appended in
|
||||
brackes (e.g. "local0.err<133>")</td>
|
||||
<td>the PRI part of the message in textual form (e.g. "syslog.info")</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b>iut</b></td>
|
||||
|
||||
@ -45,7 +45,7 @@ percent signs is literal text, which is simply written as specified.</p>
|
||||
<p>Thankfully, rsyslog provides message properties for the priority. These are
|
||||
called "PRI", "syslogfacility" and "syslogpriority" (case is important!). They are numerical
|
||||
values. Starting with rsyslog 1.13.4, there is also a property "pri-text", which
|
||||
contains the priority in friendly text format (e.g. "local0.err<133>"). For the rest
|
||||
contains the priority in friendly text format (e.g. "syslog.info"). For the rest
|
||||
of this article, I assume that you run version 1.13.4 or higher.</p>
|
||||
<p>Recording the priority is now a simple matter of adding the respective field
|
||||
to the template. It now looks like this:</p>
|
||||
@ -83,29 +83,29 @@ A little bit of configuration is required.</p>
|
||||
<p>Below is some sample data created with the template specified above. Note the
|
||||
priority recording at the start of each line.</p>
|
||||
<p>
|
||||
<code>kern.info<6>: Jun 15 18:10:38 host kernel: PCI: Sharing IRQ 11 with 00:04.0<br>
|
||||
kern.info<6>: Jun 15 18:10:38 host kernel: PCI: Sharing IRQ 11 with 01:00.0<br>
|
||||
kern.warn<4>: Jun 15 18:10:38 host kernel: Yenta IRQ list 06b8, PCI irq11<br>
|
||||
kern.warn<4>: Jun 15 18:10:38 host kernel: Socket status: 30000006<br>
|
||||
kern.warn<4>: Jun 15 18:10:38 host kernel: Yenta IRQ list 06b8, PCI irq11<br>
|
||||
kern.warn<4>: Jun 15 18:10:38 host kernel: Socket status: 30000010<br>
|
||||
kern.info<6>: Jun 15 18:10:38 host kernel: cs: IO port probe 0x0c00-0x0cff: clean.<br>
|
||||
kern.info<6>: Jun 15 18:10:38 host kernel: cs: IO port probe 0x0100-0x04ff: excluding 0x100-0x107 0x378-0x37f 0x4d0-0x4d7<br>
|
||||
kern.info<6>: Jun 15 18:10:38 host kernel: cs: IO port probe 0x0a00-0x0aff: clean.<br>
|
||||
local7.notice<189>: Jun 15 18:17:24 host dd: 1+0 records out<br>
|
||||
local7.notice<189>: Jun 15 18:17:24 host random: Saving random seed: succeeded<br>
|
||||
local7.notice<189>: Jun 15 18:17:25 host portmap: portmap shutdown succeeded<br>
|
||||
local7.notice<189>: Jun 15 18:17:25 host network: Shutting down interface eth1: succeeded<br>
|
||||
local7.notice<189>: Jun 15 18:17:25 host network: Shutting down loopback interface: succeeded<br>
|
||||
local7.notice<189>: Jun 15 18:17:25 host pcmcia: Shutting down PCMCIA services: cardmgr<br>
|
||||
user.notice<13>: Jun 15 18:17:25 host /etc/hotplug/net.agent: NET unregister event not supported<br>
|
||||
local7.notice<189>: Jun 15 18:17:27 host pcmcia: modules.<br>
|
||||
local7.notice<189>: Jun 15 18:17:29 host rc: Stopping pcmcia: succeeded<br>
|
||||
local7.notice<189>: Jun 15 18:17:30 host rc: Starting killall: succeeded<br>
|
||||
syslog.info<46>: Jun 15 18:17:33 host [origin software="rsyslogd" swVersion="1.13.3" x-pid="2464"] exiting on signal 15.<br>
|
||||
syslog.info<46>: Jun 18 10:55:47 host [origin software="rsyslogd" swVersion="1.13.3" x-pid="2367"][x-configInfo udpReception="Yes" udpPort="514" tcpReception="Yes" tcpPort="1470"] restart<br>
|
||||
user.notice<13>: Jun 18 10:55:50 host rger: test<br>
|
||||
syslog.info<46>: Jun 18 10:55:52 host [origin software="rsyslogd" swVersion="1.13.3" x-pid="2367"] exiting on signal 2.</code></p>
|
||||
<code>kern.info: Jun 15 18:10:38 host kernel: PCI: Sharing IRQ 11 with 00:04.0<br>
|
||||
kern.info: Jun 15 18:10:38 host kernel: PCI: Sharing IRQ 11 with 01:00.0<br>
|
||||
kern.warn: Jun 15 18:10:38 host kernel: Yenta IRQ list 06b8, PCI irq11<br>
|
||||
kern.warn: Jun 15 18:10:38 host kernel: Socket status: 30000006<br>
|
||||
kern.warn: Jun 15 18:10:38 host kernel: Yenta IRQ list 06b8, PCI irq11<br>
|
||||
kern.warn: Jun 15 18:10:38 host kernel: Socket status: 30000010<br>
|
||||
kern.info: Jun 15 18:10:38 host kernel: cs: IO port probe 0x0c00-0x0cff: clean.<br>
|
||||
kern.info: Jun 15 18:10:38 host kernel: cs: IO port probe 0x0100-0x04ff: excluding 0x100-0x107 0x378-0x37f 0x4d0-0x4d7<br>
|
||||
kern.info: Jun 15 18:10:38 host kernel: cs: IO port probe 0x0a00-0x0aff: clean.<br>
|
||||
local7.notice: Jun 15 18:17:24 host dd: 1+0 records out<br>
|
||||
local7.notice: Jun 15 18:17:24 host random: Saving random seed: succeeded<br>
|
||||
local7.notice: Jun 15 18:17:25 host portmap: portmap shutdown succeeded<br>
|
||||
local7.notice: Jun 15 18:17:25 host network: Shutting down interface eth1: succeeded<br>
|
||||
local7.notice: Jun 15 18:17:25 host network: Shutting down loopback interface: succeeded<br>
|
||||
local7.notice: Jun 15 18:17:25 host pcmcia: Shutting down PCMCIA services: cardmgr<br>
|
||||
user.notice: Jun 15 18:17:25 host /etc/hotplug/net.agent: NET unregister event not supported<br>
|
||||
local7.notice: Jun 15 18:17:27 host pcmcia: modules.<br>
|
||||
local7.notice: Jun 15 18:17:29 host rc: Stopping pcmcia: succeeded<br>
|
||||
local7.notice: Jun 15 18:17:30 host rc: Starting killall: succeeded<br>
|
||||
syslog.info: Jun 15 18:17:33 host [origin software="rsyslogd" swVersion="1.13.3" x-pid="2464"] exiting on signal 15.<br>
|
||||
syslog.info: Jun 18 10:55:47 host [origin software="rsyslogd" swVersion="1.13.3" x-pid="2367"][x-configInfo udpReception="Yes" udpPort="514" tcpReception="Yes" tcpPort="1470"] restart<br>
|
||||
user.notice: Jun 18 10:55:50 host rger: test<br>
|
||||
syslog.info: Jun 18 10:55:52 host [origin software="rsyslogd" swVersion="1.13.3" x-pid="2367"] exiting on signal 2.</code></p>
|
||||
<h2>Feedback Requested</h2>
|
||||
<P>I would appreciate feedback on this paper. If you have additional ideas,
|
||||
comments or find bugs, please
|
||||
|
||||
@ -4,14 +4,45 @@
|
||||
<body>
|
||||
<h1>Compatibility Notes for rsyslog v6</h1>
|
||||
<p><small><i>Written by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a>
|
||||
(2011-07-13)</i></small></p>
|
||||
(2011-10-27)</i></small></p>
|
||||
<p>
|
||||
This document describes things to keep in mind when moving from v5 to v6. It
|
||||
does not list enhancements nor does it talk about compatibility concerns introduced
|
||||
by earlier versions (for this, see their respective compatibility documents). Its focus
|
||||
is primarily on what you need to know if you used a previous version and want to use the
|
||||
current one without hassle. Note that versions prior to 6.3.3 did not have any notable compatibility
|
||||
concerns. So all said here is for 6.3.3 and above.
|
||||
current one without hassle.
|
||||
<p>Version 6 offers a better config language and some other improvements.
|
||||
As the config system has many ties into the rsyslog engine AND all plugins,
|
||||
the changes are somewhat intrusive. Note, however, that core processing has
|
||||
not been changed much in v6 and will not. So once the configuration is loaded,
|
||||
the stability of v6 is quite comparable to v5.
|
||||
</p>
|
||||
<h2>Property "pri-text"</h2>
|
||||
<p>Traditionally, this property did not only return the textual form
|
||||
of the pri ("local0.err"), but also appended the numerical value to it
|
||||
("local0.err<133>"). This sounds odd and was left unnoticed for some years.
|
||||
In October 2011, this odd behaviour was brought up on the rsyslog mailing list
|
||||
by Gregory K. Ruiz-Ade. Code review showed that the behaviour was intentional,
|
||||
but no trace of what the intention was when it was introduced could be found.
|
||||
The documentation was also unclear, it said no numerical value was present,
|
||||
but the samples had it. We agreed that the additional numerical value is
|
||||
of disadvantage. We also guessed that this property is very rarely being used,
|
||||
otherwise the problem should have been raised much earlier. However, we
|
||||
didn't want to change behaviour in older builds. So v6 was set to clean up
|
||||
the situation. In v6, text-pri will always return the textual part only
|
||||
("local0.err") and the numerical value will not be contained any longer inside
|
||||
the string. If you actually need that value, it can fairly easily be added
|
||||
via the template system.
|
||||
<p><b>If you have used this property previously and relied on the numerical
|
||||
part, you need to update your rsyslog configuration files.</b>
|
||||
<h2>Plugin ABI</h2>
|
||||
<p>The plugin interface has considerably been changed to support the new
|
||||
config language. All plugins need to be upgraded. This usually does not require
|
||||
much coding. However, if the new config language shall be supported, more
|
||||
changes must be made to plugin code. All project-supported plugins have been
|
||||
upgraded, so this compatibility issue is only of interest for you if you have
|
||||
custom plugins or use some user-contributed plugins from the rsyslog project
|
||||
that are not maintained by the project itself (omoracle is an example).
|
||||
<h2>RainerScript based rsyslog.conf</h2>
|
||||
<p>A better config format was the main release target for rsyslog v6. It comes in the
|
||||
flavor of so-called RainerScript
|
||||
|
||||
@ -2222,8 +2222,8 @@ char *textpri(char *pRes, size_t pResLen, int pri)
|
||||
assert(pRes != NULL);
|
||||
assert(pResLen > 0);
|
||||
|
||||
snprintf(pRes, pResLen, "%s.%s<%d>", syslog_fac_names[LOG_FAC(pri)],
|
||||
syslog_severity_names[LOG_PRI(pri)], pri);
|
||||
snprintf(pRes, pResLen, "%s.%s", syslog_fac_names[LOG_FAC(pri)],
|
||||
syslog_severity_names[LOG_PRI(pri)]);
|
||||
|
||||
return pRes;
|
||||
}
|
||||
|
||||
@ -204,10 +204,14 @@ finalize_it:
|
||||
if(iRet != RS_RET_OK) {
|
||||
if(data.data != NULL)
|
||||
free(data.data);
|
||||
if(pThis->bOurCertIsInit)
|
||||
if(pThis->bOurCertIsInit) {
|
||||
gnutls_x509_crt_deinit(pThis->ourCert);
|
||||
if(pThis->bOurKeyIsInit)
|
||||
pThis->bOurCertIsInit = 0;
|
||||
}
|
||||
if(pThis->bOurKeyIsInit) {
|
||||
gnutls_x509_privkey_deinit(pThis->ourKey);
|
||||
pThis->bOurKeyIsInit = 0;
|
||||
}
|
||||
}
|
||||
RETiRet;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user