summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac18
-rw-r--r--contrib/delete_mysql14
-rw-r--r--doc/status.html8
4 files changed, 25 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 09ba5ee7..0974d618 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 1.18.2 (rgerhards), 2007-08-??
+Version 1.18.2 (rgerhards), 2007-08-13
- fixed a bug in outchannel code that caused templates to be incorrectly
parsed
- fixed a bug in ommysql that caused a wrong ";template" missing message
@@ -10,6 +10,8 @@ Version 1.18.2 (rgerhards), 2007-08-??
is a debian package available - so I gladly did this) in some cases
- improved overall doc quality (some pages were quite old) and linked to
more of the online resources.
+- improved /contrib/delete_mysql script by adding a host option and some
+ other minor modifications
---------------------------------------------------------------------------
Version 1.18.1 (rgerhards), 2007-08-08
- applied a patch from varmojfekoj which solved a potential segfault
diff --git a/configure.ac b/configure.ac
index 026dd2dc..c613d5eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT(rsyslog, 1.18.2, rsyslog@lists.adiscon.com.)
+AC_INIT([rsyslog],[1.18.2],[rsyslog@lists.adiscon.com.])
AM_INIT_AUTOMAKE(rsyslog, 1.18.2)
AC_CONFIG_SRCDIR([syslogd.c])
AC_CONFIG_HEADER([config.h])
@@ -70,7 +70,7 @@ AC_CHECK_FUNCS([setsid alarm gethostbyname gethostname gettimeofday memset regco
# Large file support
AC_ARG_ENABLE(largefile,
- [AC_HELP_STRING([--enable-largefile],[Enable large file support @<:@default=yes@:>@])],
+ [AS_HELP_STRING([--enable-largefile],[Enable large file support @<:@default=yes@:>@])],
[case "${enableval}" in
yes) enable_largefile="yes" ;;
no) enable_largefile="no" ;;
@@ -84,7 +84,7 @@ fi
# SQL support
AC_ARG_ENABLE(mysql,
- [AC_HELP_STRING([--enable-mysql],[Enable MySql database support @<:@default=no@:>@])],
+ [AS_HELP_STRING([--enable-mysql],[Enable MySql database support @<:@default=no@:>@])],
[case "${enableval}" in
yes) enable_mysql="yes" ;;
no) enable_mysql="no" ;;
@@ -118,7 +118,7 @@ AC_SUBST(mysql_libs)
# Regular expressions
AC_ARG_ENABLE(regexp,
- [AC_HELP_STRING([--enable-regexp],[Enable regular expressions support @<:@default=yes@:>@])],
+ [AS_HELP_STRING([--enable-regexp],[Enable regular expressions support @<:@default=yes@:>@])],
[case "${enableval}" in
yes) enable_regexp="yes" ;;
no) enable_regexp="no" ;;
@@ -132,7 +132,7 @@ fi
# zlib compression
AC_ARG_ENABLE(zlib,
- [AC_HELP_STRING([--enable-zlib],[Enable zlib compression support @<:@default=yes@:>@])],
+ [AS_HELP_STRING([--enable-zlib],[Enable zlib compression support @<:@default=yes@:>@])],
[case "${enableval}" in
yes) enable_zlib="yes" ;;
no) enable_zlib="no" ;;
@@ -152,7 +152,7 @@ fi
# multithreading via pthreads
AC_ARG_ENABLE(pthreads,
- [AC_HELP_STRING([--enable-pthreads],[Enable multithreading via pthreads @<:@default=yes@:>@])],
+ [AS_HELP_STRING([--enable-pthreads],[Enable multithreading via pthreads @<:@default=yes@:>@])],
[case "${enableval}" in
yes) enable_pthreads="yes" ;;
no) enable_pthreads="no" ;;
@@ -182,7 +182,7 @@ AS_IF([test "x$enable_pthreads" != "xno"],
# klogd
AC_ARG_ENABLE(klogd,
- [AC_HELP_STRING([--enable-klogd],[Integrated klogd functionality @<:@default=yes@:>@])],
+ [AS_HELP_STRING([--enable-klogd],[Integrated klogd functionality @<:@default=yes@:>@])],
[case "${enableval}" in
yes) enable_klogd="yes" ;;
no) enable_klogd="no" ;;
@@ -216,7 +216,7 @@ AC_ARG_ENABLE([unix],
# inet
AC_ARG_ENABLE(inet,
- [AC_HELP_STRING([--enable-inet],[Enable networking support @<:@default=yes@:>@])],
+ [AS_HELP_STRING([--enable-inet],[Enable networking support @<:@default=yes@:>@])],
[case "${enableval}" in
yes) enable_inet="yes" ;;
no) enable_inet="no" ;;
@@ -251,7 +251,7 @@ AC_ARG_ENABLE([fsstnd],
# debug
AC_ARG_ENABLE(debug,
- [AC_HELP_STRING([--enable-debug],[Enable debug mode @<:@default=no@:>@])],
+ [AS_HELP_STRING([--enable-debug],[Enable debug mode @<:@default=no@:>@])],
[case "${enableval}" in
yes) enable_debug="yes" ;;
no) enable_debug="no" ;;
diff --git a/contrib/delete_mysql b/contrib/delete_mysql
index c0d2ce8a..3ed84d17 100644
--- a/contrib/delete_mysql
+++ b/contrib/delete_mysql
@@ -7,6 +7,8 @@
# This program was original part of of PHPloghost
# Copyright (C) 2004 Tuatha de Dana
# some modifications for rsyslog by mmeckelein at 2007-08-08
+# 2007-08-13 mmeckelein: added dbhost and some other improvements
+# suggested by Michael Mansour - thx a lot!
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -23,8 +25,9 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111- 1307, USA.
# Change these variables to reflect your situation.
-database=sqlsyslogd
-export table=logs
+database=sqlrsyslogd
+dbhost="localhost"
+export table=systemevents
sqluser=""
password=""
@@ -33,16 +36,17 @@ mysqld=/usr/bin/mysql
# A couple of steps should be taken to maintain your database.
# If not, the number of messages will fill your database.
-# By default, logs are deleted after they're one year old.
+# By default, logs are deleted after they're 30 days old.
# Change this to meet your requirements.
# rsyslog's default database template use two date columns
# ReceivedAt and DeviceReportedTime. You can use either of
# the two and in most cases it doesn't make a huge difference.
# See the property replacer doc at http://www.rsyslog.com/doc
# for details on the two dates.
-SQL_DELETE="DELETE FROM $table WHERE ReceivedAt < CURDATE() - INTERVAL 1 year;"
+SQL_DELETE="DELETE FROM $table WHERE ReceivedAt < CURDATE() - INTERVAL 30 DAY;"
# After a large amount of rows have been deleted, we should # optimize the table.
SQL_OPT="OPTIMIZE TABLE $table;";
-$mysqld -u$sqluser -p$password -e"$SQL_DELETE" -D$database $mysqld -u$sqluser -p$password -e"$SQL_OPT" -D$database
+$mysqld -u$sqluser -p$password -h$dbhost -e"$SQL_DELETE" -D$database
+$mysqld -u$sqluser -p$password -h$dbhost -e"$SQL_OPT" -D$database
diff --git a/doc/status.html b/doc/status.html
index 77fa50cd..4037f617 100644
--- a/doc/status.html
+++ b/doc/status.html
@@ -4,11 +4,11 @@
</head>
<body>
<h2>rsyslog status page</h2>
-<p>This page reflects the status as of 2007-08-08.</p>
+<p>This page reflects the status as of 2007-08-13.</p>
<h2>Current Releases</h2>
-<p><b>development:</b> 1.18.1 -
-<a href="http://www.rsyslog.com/Article108.phtml">change log</a> -
-<a href="http://www.rsyslog.com/Downloads-index-req-getit-lid-50.phtml">download</a></p>
+<p><b>development:</b> 1.18.2 -
+<a href="http://www.rsyslog.com/Article112.phtml">change log</a> -
+<a href="http://www.rsyslog.com/Downloads-index-req-getit-lid-51.phtml">download</a></p>
<p><b>stable:</b> 1.0.5 - <a href="http://www.rsyslog.com/Article85.phtml">change log</a> -
<a href="http://www.rsyslog.com/Downloads-index-req-getit-lid-39.phtml">download</a></p>
<p>&nbsp;(<a href="version_naming.html">How are versions named?</a>)</p>