projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mysql plugin: Allow configuration of `Port' and `Socket'.
[collectd.git]
/
src
/
mysql.c
diff --git
a/src/mysql.c
b/src/mysql.c
index
4e72b5b
..
08df3fa
100644
(file)
--- a/
src/mysql.c
+++ b/
src/mysql.c
@@
-38,14
+38,18
@@
static const char *config_keys[] =
"User",
"Password",
"Database",
"User",
"Password",
"Database",
+ "Port",
+ "Socket",
NULL
};
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 *host = "localhost";
static char *user;
static char *pass;
static char *db = NULL;
+static char *socket = NULL;
+static int port = 0;
static MYSQL *getconnection (void)
{
static MYSQL *getconnection (void)
{
@@
-88,7
+92,7
@@
static MYSQL *getconnection (void)
return (NULL);
}
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;
{
ERROR ("mysql_real_connect failed: %s", mysql_error (con));
state = 0;
@@
-113,6
+117,10
@@
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);
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)
+ return ((port = atoi (value)) == NULL ? 1 : 0);
else
return (-1);
}
else
return (-1);
}