projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f8e9db2
)
mysql plugin: Make the `Database' option optional again.
author
Florian Forster
<octo@leeloo.lan.home.verplant.org>
Sat, 28 Mar 2009 08:42:23 +0000
(09:42 +0100)
committer
Florian Forster
<octo@leeloo.lan.home.verplant.org>
Sat, 28 Mar 2009 08:42:23 +0000
(09:42 +0100)
src/mysql.c
patch
|
blob
|
history
diff --git
a/src/mysql.c
b/src/mysql.c
index
0d3cb7f
..
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);
return (status);
}
assert (db->instance != NULL);
- db->database = strdup (db->instance);
}
else
{
}
else
{
@@
-318,11
+317,6
@@
static int mysql_config (oconfig_item_t *ci) /* {{{ */
db->port);
status = -1;
}
db->port);
status = -1;
}
- if (db->database == NULL)
- {
- ERROR ("mysql plugin: No `Database' configured");
- status = -1;
- }
break;
} /* while (status == 0) */
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];
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;
memset (&ud, 0, sizeof (ud));
ud.data = (void *) db;