summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-07-11 08:45:49 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-07-11 08:45:49 +0200
commit1486175e6b0e1f33a59ec80585f7c33fb97b49c3 (patch)
treeb44d8e89614d5c527f99ebd935a659134f2170f1
parentb46151989f97aaa3bc520c56f3c87fe2bc068958 (diff)
downloadrsyslog-1486175e6b0e1f33a59ec80585f7c33fb97b49c3.tar.gz
rsyslog-1486175e6b0e1f33a59ec80585f7c33fb97b49c3.tar.xz
rsyslog-1486175e6b0e1f33a59ec80585f7c33fb97b49c3.zip
bugfix & doc improvement
bugfix for mem leak in disk-based queue modes (backport from devel) plus an update to the list of distributions where rsyslog packages are available.
-rw-r--r--doc/rsyslog_packages.html84
-rw-r--r--queue.c2
2 files changed, 59 insertions, 27 deletions
diff --git a/doc/rsyslog_packages.html b/doc/rsyslog_packages.html
index 38c43c93..fe3fc57e 100644
--- a/doc/rsyslog_packages.html
+++ b/doc/rsyslog_packages.html
@@ -5,43 +5,73 @@
<body>
<h1>rsyslog packages</h1>
<p><b>Thanks to some volunteers, rsyslog is also available in package form on
-some distributions.</b> All available packages are listed below. If you would
+some distributions.</b> All currently known packages are listed below. If I have forgotten
+one or if you would
like to maintain a package for a new distribution, please mail me at
<a href="mailto:rgerhards@adiscon.com">rgerhards@adiscon.com</a>. Any help is *deeply*
appreciated. While I create the core daemon, the package maintainers are really
filling it with life, making it available to the average user. I am very
grateful for that!</p>
-<p>This list has last been updated on 2007-07-06 by
+<p>This list has last been updated on 2008-07-11 by
<a href="http://www.adiscon.com/en/people/rainer-gerhards.php">Rainer Gerhards</a>.
New packages may appear at any time, so be sure to check this page whenever you
need a new one.</p>
-<p>Red Hat has recently begun to build RPMs for rsyslog. The URL changes, but a
-good place to look for them is at
-<a href="http://freshmeat.net/projects/rsyslog/">freshmeat's rsyslog info page</a>.
-Please note that the Red Hat RPMs do currently <b>not</b> include MySQL
-functionality. If you need that, you need to compile from the source tarball
-(which honestly is quite easy).</p>
-<h2>BSD</h2>
-<p>Give <a href="http://www.freshports.org/sysutils/rsyslog/">
-http://www.freshports.org/sysutils/rsyslog/</a> a try.</p>
-
-<h2>CentOS 4.3</h2>
-<a href="http://www.se-community.com/~james/rsyslog/">
-http://www.se-community.com/~james/rsyslog/</a></p>
-<p>Maintained by<b> James Bergamin.</b></p>
-
-<h2>openSUSE</h2>
-<a href="http://download.opensuse.org/repositories/home:/darix/">
-http://download.opensuse.org/repositories/home:/darix/</a></p>
-<p>Maintained by<b> darix</b></p>
-
-<h2>Almost any Linux</h2>
-<p><b>Bennet Todd</b> maintains packages that should work on almost any Linux.
+<ul>
+<li><b>BSD</b> (maintained by infofarmer)
+ <ul>
+ <li><a href="http://www.freshports.org/sysutils/rsyslog/"> http://www.freshports.org/sysutils/rsyslog/</a>
+ </ul>
+
+<li><b>CentOS 4.3</b> (maintained by James Bergamin)
+ <ul>
+ <li><a href="http://www.se-community.com/~james/rsyslog/">
+http://www.se-community.com/~james/rsyslog/</a>
+ </ul>
+
+<li><b>Debian</b> (maintained by Michael Biebl)
+ <ul>
+ <li><a href="http://packages.debian.org/sid/rsyslog">http://packages.debian.org/sid/rsyslog</a>
+ </ul>
+
+<li><b>Fedora</b>
+ <ul>
+ <li>Starting with Fedora 8, rsyslog is available as part of the core distribution.
+ </ul>
+
+<li><b>openSUSE</b> (maintained by darix)
+ <ul>
+ <li><a href="http://download.opensuse.org/repositories/home:/darix/">http://download.opensuse.org/repositories/home:/darix/</a>
+ </ul>
+
+<li><b>Red Hat Enterprise Linux</b>
+ <ul>
+ <li>Starting with RHEL 5.2, rsyslog is available as part of the core distribution.
+ </ul>
+
+<li><b>Ubuntu</b>
+ <ul>
+ <li><a href="http://packages.ubuntu.com/hardy/rsyslog">http://packages.ubuntu.com/hardy/rsyslog</a>
+ <li><a href="http://packages.ubuntu.com/intrepid/rsyslog">http://packages.ubuntu.com/intrepid/rsyslog</a>
+ </ul>
+
+<li>Almost any Linux</h2>
+ <ul>
+ <li>Bennet Todd maintains packages that should work on almost any Linux.
He keeps a current i386 tree. There is also a PPC tree, but that one is not paid
-much attention for (anyhow, it is known to typically work well, too).</p>
-<p>Please visit <a href="http://bent.latency.net/bent/">
+much attention for (anyhow, it is known to typically work well, too).
+Please visit <a href="http://bent.latency.net/bent/">
http://bent.latency.net/bent/</a>, select the relevant tree and then do a search
-for rsyslog.</p>
+for rsyslog.
+Please note, however, that as of this writing the versions in this repository
+have been aged a bit. So it may be worth trying to find some other places first.
+ </ul>
+</ul>
+
+<p>Just in case you are interested, the list of distribution is sorted by alphabetic order
+of the distribution name.
+<p>If you do not find a suitable package for your distribution, there is no reason
+to panic. It is quite simple to install rsyslog from the source tarball, so you
+should consider that.
</body>
</html>
diff --git a/queue.c b/queue.c
index 20ead4a1..a502ff40 100644
--- a/queue.c
+++ b/queue.c
@@ -845,6 +845,8 @@ static rsRetVal qAddDisk(queue_t *pThis, void* pUsr)
pThis->tVars.disk.sizeOnDisk += nWriteCount;
+ /* The following line is a backport from 3.19.10 - fixes mem leak */
+ objDestruct(pUsr);
dbgoprint((obj_t*) pThis, "write wrote %lld octets to disk, queue disk size now %lld octets\n",
nWriteCount, pThis->tVars.disk.sizeOnDisk);