X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmysql.c;h=67a9aacc730d7ff32be71c3ac3f29af7215788ee;hb=c5c7a3b493b6dbb246fff39e401d49cd454460a9;hp=d4728531027be022e8ad9d6a57994a06711785d8;hpb=7e4b7b46592718cafa5f21ce03bd10dcf919a26d;p=collectd.git

diff --git a/src/mysql.c b/src/mysql.c
index d4728531..67a9aacc 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -1,6 +1,7 @@
 /**
  * collectd - src/mysql.c
- * Copyright (C) 2006,2007  Florian octo Forster
+ * Copyright (C) 2006–2008  Florian octo Forster
+ * Copyright (C) 2009       Mirko Buffoni
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -17,6 +18,7 @@
  *
  * Authors:
  *   Florian octo Forster <octo at verplant.org>
+ *   Mirko Buffoni <briareos at eswat.org>
  **/
 
 #include "collectd.h"
@@ -24,7 +26,9 @@
 #include "plugin.h"
 #include "configfile.h"
 
-#ifdef HAVE_MYSQL_MYSQL_H
+#ifdef HAVE_MYSQL_H
+#include <mysql.h>
+#elif defined(HAVE_MYSQL_MYSQL_H)
 #include <mysql/mysql.h>
 #endif
 
@@ -36,14 +40,18 @@ static const char *config_keys[] =
 	"User",
 	"Password",
 	"Database",
+	"Port",
+	"Socket",
 	NULL
 };
-static int config_keys_num = 4;
+static int config_keys_num = 6;
 
 static char *host = "localhost";
 static char *user;
 static char *pass;
 static char *db = NULL;
+static char *socket = NULL;
+static int   port = 0;
 
 static MYSQL *getconnection (void)
 {
@@ -86,7 +94,7 @@ static MYSQL *getconnection (void)
 		return (NULL);
 	}
 
-	if (mysql_real_connect (con, host, user, pass, db, 0, NULL, 0) == NULL)
+	if (mysql_real_connect (con, host, user, pass, db, port, socket, 0) == NULL)
 	{
 		ERROR ("mysql_real_connect failed: %s", mysql_error (con));
 		state = 0;
@@ -111,9 +119,36 @@ static int config (const char *key, const char *value)
 		return ((pass = strdup (value)) == NULL ? 1 : 0);
 	else if (strcasecmp (key, "database") == 0)
 		return ((db = strdup (value)) == NULL ? 1 : 0);
+	else if (strcasecmp (key, "socket") == 0)
+		return ((socket = strdup (value)) == NULL ? 1 : 0);
+	else if (strcasecmp (key, "port") == 0)
+	{
+	    char *endptr = NULL;
+	    int temp;
+
+	    errno = 0;
+	    temp = strtol (value, &endptr, 0);
+	    if ((errno != 0) || (value == endptr))
+	    {
+		ERROR ("mysql plugin: Invalid \"Port\" argument: %s",
+			value);
+		port = 0;
+		return (1);
+	    }
+	    else if ((temp < 0) || (temp >= 65535))
+	    {
+		ERROR ("mysql plugin: Port number out of range: %i",
+			temp);
+		port = 0;
+		return (1);
+	    }
+
+	    port = temp;
+	    return (0);
+	}
 	else
 		return (-1);
-}
+} /* int config */
 
 static void counter_submit (const char *type, const char *type_instance,
 		counter_t value)
@@ -125,12 +160,12 @@ static void counter_submit (const char *type, const char *type_instance,
 
 	vl.values = values;
 	vl.values_len = 1;
-	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "mysql");
-	strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin));
+	sstrncpy (vl.type, type, sizeof (vl.type));
+	sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 
-	plugin_dispatch_values (type, &vl);
+	plugin_dispatch_values (&vl);
 } /* void counter_submit */
 
 static void qcache_submit (counter_t hits, counter_t inserts,
@@ -148,11 +183,11 @@ static void qcache_submit (counter_t hits, counter_t inserts,
 
 	vl.values = values;
 	vl.values_len = 5;
-	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "mysql");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin));
+	sstrncpy (vl.type, "mysql_qcache", sizeof (vl.type));
 
-	plugin_dispatch_values ("mysql_qcache", &vl);
+	plugin_dispatch_values (&vl);
 } /* void qcache_submit */
 
 static void threads_submit (gauge_t running, gauge_t connected, gauge_t cached,
@@ -168,11 +203,11 @@ static void threads_submit (gauge_t running, gauge_t connected, gauge_t cached,
 
 	vl.values = values;
 	vl.values_len = 4;
-	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "mysql");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin));
+	sstrncpy (vl.type, "mysql_threads", sizeof (vl.type));
 
-	plugin_dispatch_values ("mysql_threads", &vl);
+	plugin_dispatch_values (&vl);
 } /* void threads_submit */
 
 static void traffic_submit (counter_t rx, counter_t tx)
@@ -185,11 +220,11 @@ static void traffic_submit (counter_t rx, counter_t tx)
 
 	vl.values = values;
 	vl.values_len = 2;
-	vl.time = time (NULL);
-	strcpy (vl.host, hostname_g);
-	strcpy (vl.plugin, "mysql");
+	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+	sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin));
+	sstrncpy (vl.type, "mysql_octets", sizeof (vl.type));
 
-	plugin_dispatch_values ("mysql_octets", &vl);
+	plugin_dispatch_values (&vl);
 } /* void traffic_submit */
 
 static int mysql_read (void)