X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdbi.c;h=80488d8478f6df99c748de2e4e39e872b1236701;hb=31246d467de836ac962ee65fa974e348a8fdd351;hp=acf3b7612b9d2a853b8fc1fb0852708cc0a6d630;hpb=f229efa7d0202c119589577ad76899d0e92d04c0;p=collectd.git diff --git a/src/dbi.c b/src/dbi.c index acf3b761..80488d84 100644 --- a/src/dbi.c +++ b/src/dbi.c @@ -48,7 +48,7 @@ struct cdbi_database_s /* {{{ */ char *select_db; char *driver; - char *hostname; + char *host; cdbi_driver_option_t *driver_options; size_t driver_options_num; @@ -298,8 +298,8 @@ static int cdbi_config_add_database (oconfig_item_t *ci) /* {{{ */ else if (strcasecmp ("Query", child->key) == 0) status = udb_query_pick_from_list (child, queries, queries_num, &db->queries, &db->queries_num); - else if (strcasecmp ("Hostname", child->key) == 0) - status = cf_util_get_string (child, &db->hostname); + else if (strcasecmp ("Host", child->key) == 0) + status = cf_util_get_string (child, &db->host); else { WARNING ("dbi plugin: Option `%s' not allowed here.", child->key); @@ -557,7 +557,7 @@ static int cdbi_read_database_query (cdbi_database_t *db, /* {{{ */ sstrncpy (column_names[i], column_name, DATA_MAX_NAME_LEN); } /* }}} for (i = 0; i < column_num; i++) */ - udb_query_prepare_result (q, prep_area, (db->hostname ? db->hostname : hostname_g), + udb_query_prepare_result (q, prep_area, (db->host ? db->host : hostname_g), /* plugin = */ "dbi", db->name, column_names, column_num, /* interval = */ 0);