Changed default `host' for `mysql' to `localhost'

Added SIGTERM handler
Updated `ChangeLog'

diff --git a/ChangeLog b/ChangeLog
index f6a591f34b45f48ee3767ccd93c18fefb3bcc849..7bffaa822416d6a42460e055eec47cd620b49e62 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-17, Version 3.6.0
+       * A config file has been added. This allows for loading only specific
+         plugins.
+       * A `mysql' plugin has been added.
+       * A signal handler for SIGTERM has been added.
+
 2005-12-07, Version 3.5.0 (Revision 326)
        * A bug in the `load' module under Solaris has been fixed.
        * The `users' module has been contributed by Sebastian Harl. It counts

diff --git a/configure.in b/configure.in
index 8d90a9e66e9fa8380d648258920be83489e99282..15903be9e89a03579bc5faf7b0d3b952f072084b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(collectd, 3.5.0)
+AC_INIT(collectd, 3.6.alpha0)
 AC_CONFIG_SRCDIR(src/collectd.c)
 AC_CONFIG_HEADERS(src/config.h)
 AM_INIT_AUTOMAKE(dist-bzip2)

diff --git a/src/collectd.c b/src/collectd.c
index c86a67803ade6fd7b686de0d67007a9316a9b9e1..e8081785564cacc572cb5161907d48166606aa7b 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -55,6 +55,11 @@ static void sigIntHandler (int signal)
        loop++;
 }
 
+static void sigTermHandler (int signal)
+{
+       loop++;
+}
+
 static int change_basedir (char *dir)
 {
        int dirlen = strlen (dir);
@@ -256,7 +261,9 @@ static int pidfile_remove (const char *file)
 
 int main (int argc, char **argv)
 {
-       struct sigaction sigIntAction, sigChldAction;
+       struct sigaction sigIntAction;
+       struct sigaction sigTermAction;
+       struct sigaction sigChldAction;
        char *configfile = CONFIGFILE;
        char *plugindir  = PLUGINDIR;
        char *datadir    = PKGLOCALSTATEDIR;
@@ -380,6 +387,9 @@ int main (int argc, char **argv)
        sigIntAction.sa_handler = sigIntHandler;
        sigaction (SIGINT, &sigIntAction, NULL);
 
+       sigIntAction.sa_handler = sigTermHandler;
+       sigaction (SIGTERM, &sigTermAction, NULL);
+
        sigChldAction.sa_handler = SIG_IGN;
        sigaction (SIGCHLD, &sigChldAction, NULL);
 

diff --git a/src/mysql.c b/src/mysql.c
index 1ac62e9809e34077e455cdf85d8c00bd9fdf1ab3..bd9685b632b56a629642392ebd30855126e88407 100644 (file)
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -39,7 +39,7 @@
 
 #define BUFSIZE 512
 
-static char *host;
+static char *host = "localhost";
 static char *user;
 static char *pass;
 static char *db = NULL;
@@ -126,7 +126,10 @@ static void init (void)
        if (getconnection () != NULL)
                init_suceeded = 1;
        else
+       {
+               syslog (LOG_ERR, "The `mysql' plugin will be disabled because `init' failed to connect to `%s'", host);
                init_suceeded = 0;
+       }
 #endif /* MYSQL_HAVE_READ */
 
        return;