X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fpostgresql.c;h=a72109aebc29d838211423c7c2ebd8a0559ca6d0;hb=3faf514fd9b869cadda0f895e14e5036313c7781;hp=dd53cb4fd2b018fd11dd18a8d1c5788b7cc95a04;hpb=2bdaa472d6955a8c93c6aa77f11748d4c611558e;p=collectd.git

diff --git a/src/postgresql.c b/src/postgresql.c
index dd53cb4f..a72109ae 100644
--- a/src/postgresql.c
+++ b/src/postgresql.c
@@ -95,6 +95,7 @@ typedef enum {
 	C_PSQL_PARAM_DB,
 	C_PSQL_PARAM_USER,
 	C_PSQL_PARAM_INTERVAL,
+	C_PSQL_PARAM_INSTANCE,
 } c_psql_param_t;
 
 /* Parameter configuration. Stored as `user data' in the query objects. */
@@ -117,7 +118,7 @@ typedef struct {
 	udb_query_t    **queries;
 	size_t           queries_num;
 
-	int interval;
+	cdtime_t interval;
 
 	char *host;
 	char *port;
@@ -125,6 +126,8 @@ typedef struct {
 	char *user;
 	char *password;
 
+	char *instance;
+
 	char *sslmode;
 
 	char *krbsrvname;
@@ -177,6 +180,8 @@ static c_psql_database_t *c_psql_database_new (const char *name)
 	db->user       = NULL;
 	db->password   = NULL;
 
+	db->instance   = sstrdup (name);
+
 	db->sslmode    = NULL;
 
 	db->krbsrvname = NULL;
@@ -208,6 +213,8 @@ static void c_psql_database_delete (void *data)
 	sfree (db->user);
 	sfree (db->password);
 
+	sfree (db->instance);
+
 	sfree (db->sslmode);
 
 	sfree (db->krbsrvname);
@@ -271,8 +278,9 @@ static int c_psql_check_connection (c_psql_database_t *db)
 
 		if (CONNECTION_OK != PQstatus (db->conn)) {
 			c_complain (LOG_ERR, &db->conn_complaint,
-					"Failed to connect to database %s: %s",
-					db->database, PQerrorMessage (db->conn));
+					"Failed to connect to database %s (%s): %s",
+					db->database, db->instance,
+					PQerrorMessage (db->conn));
 			return -1;
 		}
 
@@ -335,10 +343,15 @@ static PGresult *c_psql_exec_query_params (c_psql_database_t *db,
 				params[i] = db->user;
 				break;
 			case C_PSQL_PARAM_INTERVAL:
-				ssnprintf (interval, sizeof (interval), "%i",
-						db->interval > 0 ? db->interval : interval_g);
+				ssnprintf (interval, sizeof (interval), "%.3f",
+						(db->interval > 0)
+						? CDTIME_T_TO_DOUBLE (db->interval)
+						: plugin_get_interval ());
 				params[i] = interval;
 				break;
+			case C_PSQL_PARAM_INSTANCE:
+				params[i] = db->instance;
+				break;
 			default:
 				assert (0);
 		}
@@ -376,9 +389,10 @@ static int c_psql_exec_query (c_psql_database_t *db, udb_query_t *q,
 	else if ((NULL == data) || (0 == data->params_num))
 		res = c_psql_exec_query_noparams (db, q);
 	else {
-		log_err ("Connection to database \"%s\" does not support parameters "
-				"(protocol version %d) - cannot execute query \"%s\".",
-				db->database, db->proto_version,
+		log_err ("Connection to database \"%s\" (%s) does not support "
+				"parameters (protocol version %d) - "
+				"cannot execute query \"%s\".",
+				db->database, db->instance, db->proto_version,
 				udb_query_get_name (q));
 		return -1;
 	}
@@ -435,7 +449,7 @@ static int c_psql_exec_query (c_psql_database_t *db, udb_query_t *q,
 		host = db->host;
 
 	status = udb_query_prepare_result (q, prep_area, host, "postgresql",
-			db->database, column_names, (size_t) column_num, db->interval);
+			db->instance, column_names, (size_t) column_num, db->interval);
 	if (0 != status) {
 		log_err ("udb_query_prepare_result failed with status %i.",
 				status);
@@ -486,6 +500,7 @@ static int c_psql_read (user_data_t *ud)
 	db = ud->data;
 
 	assert (NULL != db->database);
+	assert (NULL != db->instance);
 
 	if (0 != c_psql_check_connection (db))
 		return -1;
@@ -522,41 +537,6 @@ static int c_psql_shutdown (void)
 	return 0;
 } /* c_psql_shutdown */
 
-static int config_set_s (char *name, char **var, const oconfig_item_t *ci)
-{
-	if ((0 != ci->children_num) || (1 != ci->values_num)
-			|| (OCONFIG_TYPE_STRING != ci->values[0].type)) {
-		log_err ("%s expects a single string argument.", name);
-		return 1;
-	}
-
-	sfree (*var);
-	*var = sstrdup (ci->values[0].value.string);
-	return 0;
-} /* config_set_s */
-
-static int config_set_i (char *name, int *var,
-		const oconfig_item_t *ci, int min)
-{
-	int value;
-
-	if ((0 != ci->children_num) || (1 != ci->values_num)
-			|| (OCONFIG_TYPE_NUMBER != ci->values[0].type)) {
-		log_err ("%s expects a single number argument.", name);
-		return 1;
-	}
-
-	value = (int)ci->values[0].value.number;
-
-	if (value < min) {
-		log_err ("%s expects a number greater or equal to %i.", name, min);
-		return 1;
-	}
-
-	*var = value;
-	return 0;
-} /* config_set_s */
-
 static int config_query_param_add (udb_query_t *q, oconfig_item_t *ci)
 {
 	c_psql_user_data_t *data;
@@ -592,6 +572,8 @@ static int config_query_param_add (udb_query_t *q, oconfig_item_t *ci)
 		data->params[data->params_num] = C_PSQL_PARAM_USER;
 	else if (0 == strcasecmp (param_str, "interval"))
 		data->params[data->params_num] = C_PSQL_PARAM_INTERVAL;
+	else if (0 == strcasecmp (param_str, "instance"))
+		data->params[data->params_num] = C_PSQL_PARAM_INSTANCE;
 	else {
 		log_err ("Invalid parameter \"%s\".", param_str);
 		return 1;
@@ -618,7 +600,7 @@ static int c_psql_config_database (oconfig_item_t *ci)
 	c_psql_database_t *db;
 
 	char cb_name[DATA_MAX_NAME_LEN];
-	struct timespec cb_interval;
+	struct timespec cb_interval = { 0, 0 };
 	user_data_t ud;
 
 	int i;
@@ -639,24 +621,26 @@ static int c_psql_config_database (oconfig_item_t *ci)
 		oconfig_item_t *c = ci->children + i;
 
 		if (0 == strcasecmp (c->key, "Host"))
-			config_set_s ("Host", &db->host, c);
+			cf_util_get_string (c, &db->host);
 		else if (0 == strcasecmp (c->key, "Port"))
-			config_set_s ("Port", &db->port, c);
+			cf_util_get_service (c, &db->port);
 		else if (0 == strcasecmp (c->key, "User"))
-			config_set_s ("User", &db->user, c);
+			cf_util_get_string (c, &db->user);
 		else if (0 == strcasecmp (c->key, "Password"))
-			config_set_s ("Password", &db->password, c);
+			cf_util_get_string (c, &db->password);
+		else if (0 == strcasecmp (c->key, "Instance"))
+			cf_util_get_string (c, &db->instance);
 		else if (0 == strcasecmp (c->key, "SSLMode"))
-			config_set_s ("SSLMode", &db->sslmode, c);
+			cf_util_get_string (c, &db->sslmode);
 		else if (0 == strcasecmp (c->key, "KRBSrvName"))
-			config_set_s ("KRBSrvName", &db->krbsrvname, c);
+			cf_util_get_string (c, &db->krbsrvname);
 		else if (0 == strcasecmp (c->key, "Service"))
-			config_set_s ("Service", &db->service, c);
+			cf_util_get_string (c, &db->service);
 		else if (0 == strcasecmp (c->key, "Query"))
 			udb_query_pick_from_list (c, queries, queries_num,
 					&db->queries, &db->queries_num);
 		else if (0 == strcasecmp (c->key, "Interval"))
-			config_set_i ("Interval", &db->interval, c, /* min = */ 1);
+			cf_util_get_cdtime (c, &db->interval);
 		else
 			log_warn ("Ignoring unknown config key \"%s\".", c->key);
 	}
@@ -699,14 +683,13 @@ static int c_psql_config_database (oconfig_item_t *ci)
 	ud.data = db;
 	ud.free_func = c_psql_database_delete;
 
-	ssnprintf (cb_name, sizeof (cb_name), "postgresql-%s", db->database);
+	ssnprintf (cb_name, sizeof (cb_name), "postgresql-%s", db->instance);
 
-	memset (&cb_interval, 0, sizeof (cb_interval));
-	if (db->interval > 0)
-		cb_interval.tv_sec = (time_t)db->interval;
+	CDTIME_T_TO_TIMESPEC (db->interval, &cb_interval);
 
 	plugin_register_complex_read ("postgresql", cb_name, c_psql_read,
-			/* interval = */ &cb_interval, &ud);
+			/* interval = */ (db->interval > 0) ? &cb_interval : NULL,
+			&ud);
 	return 0;
 } /* c_psql_config_database */
 
@@ -737,8 +720,7 @@ static int c_psql_config (oconfig_item_t *ci)
 
 		if (0 == strcasecmp (c->key, "Query"))
 			udb_query_create (&queries, &queries_num, c,
-					/* callback = */ config_query_callback,
-					/* legacy mode = */ 1);
+					/* callback = */ config_query_callback);
 		else if (0 == strcasecmp (c->key, "Database"))
 			c_psql_config_database (c);
 		else