Merge branch 'er/ted'

[collectd.git] / src / mysql.c

diff --git a/src/mysql.c b/src/mysql.c
index 565a88e..a129f40 100644 (file)
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -223,7 +223,6 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */
                        return (status);
                }
                assert (db->instance != NULL);
-               db->database = strdup (db->instance);
        }
        else
        {
@@ -318,11 +317,6 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */
                                        db->port);
                        status = -1;
                }
-               if (db->database == NULL)
-               {
-                       ERROR ("mysql plugin: No `Database' configured");
-                       status = -1;
-               }
                break;
        } /* while (status == 0) */
 
@@ -332,7 +326,8 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */
                user_data_t ud;
                char cb_name[DATA_MAX_NAME_LEN];
 
-               DEBUG ("mysql plugin: Registering new read callback: %s", db->database);
+               DEBUG ("mysql plugin: Registering new read callback: %s",
+                               (db->database != NULL) ? db->database : "<default>");
 
                memset (&ud, 0, sizeof (ud));
                ud.data = (void *) db;
@@ -385,12 +380,22 @@ static MYSQL *getconnection (mysql_database_t *db)
        if (mysql_real_connect (db->con, db->host, db->user, db->pass,
                                db->database, db->port, db->socket, 0) == NULL)
        {
-               ERROR ("mysql_real_connect failed: %s", mysql_error (db->con));
+               ERROR ("mysql plugin: Failed to connect to database %s "
+                               "at server %s: %s",
+                               (db->database != NULL) ? db->database : "<none>",
+                               (db->host != NULL) ? db->host : "localhost",
+                               mysql_error (db->con));
                db->state = 0;
                return (NULL);
        }
        else
        {
+               INFO ("mysql plugin: Sucessfully connected to database %s "
+                               "at server %s (server version: %s, protocol version: %d)",
+                               (db->database != NULL) ? db->database : "<none>",
+                               mysql_get_host_info (db->con),
+                               mysql_get_server_info (db->con),
+                               mysql_get_proto_info (db->con));
                db->state = 1;
                return (db->con);
        }