X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fpostgresql.c;h=929b925c9924bec1b4dc09e7536f58c0aed2c972;hb=cce136946b879557f91183e4de58e92b81e138c8;hp=635abfca61bf5647b4d53cea55601a5182a8997e;hpb=5c78be034ebf8edbf2ae98e9163a38b2d61fbb68;p=collectd.git

diff --git a/src/postgresql.c b/src/postgresql.c
index 635abfca..929b925c 100644
--- a/src/postgresql.c
+++ b/src/postgresql.c
@@ -135,6 +135,7 @@ typedef struct {
 	/* writer "caching" settings */
 	cdtime_t commit_interval;
 	cdtime_t next_commit;
+	cdtime_t expire_delay;
 
 	char *host;
 	char *port;
@@ -257,6 +258,7 @@ static c_psql_database_t *c_psql_database_new (const char *name)
 
 	db->commit_interval = 0;
 	db->next_commit     = 0;
+	db->expire_delay    = 0;
 
 	db->database   = sstrdup (name);
 	db->host       = NULL;
@@ -770,7 +772,7 @@ static char *values_to_sqlarray (const data_set_t *ds, const value_list_t *vl,
 
 		if (ds->ds[i].type == DS_TYPE_GAUGE)
 			status = ssnprintf (str_ptr, str_len,
-					",%f", vl->values[i].gauge);
+					","GAUGE_FORMAT, vl->values[i].gauge);
 		else if (store_rates) {
 			if (rates == NULL)
 				rates = uc_get_rate (ds, vl);
@@ -867,6 +869,12 @@ static int c_psql_write (const data_set_t *ds, const value_list_t *vl,
 
 #undef VALUE_OR_NULL
 
+	if( db->expire_delay > 0 && vl->time < (cdtime() - vl->interval - db->expire_delay) ) {
+		log_info ("c_psql_write: Skipped expired value @ %s - %s/%s-%s/%s-%s/%s", 
+			params[0], params[1], params[2], params[3], params[4], params[5], params[6] );
+		return 0;
+        }
+
 	pthread_mutex_lock (&db->db_lock);
 
 	if (0 != c_psql_check_connection (db)) {
@@ -1188,7 +1196,6 @@ 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 = { 0, 0 };
 	user_data_t ud;
 
 	static _Bool have_flush = 0;
@@ -1236,6 +1243,8 @@ static int c_psql_config_database (oconfig_item_t *ci)
 			cf_util_get_cdtime (c, &db->interval);
 		else if (strcasecmp ("CommitInterval", c->key) == 0)
 			cf_util_get_cdtime (c, &db->commit_interval);
+		else if (strcasecmp ("ExpireDelay", c->key) == 0)
+			cf_util_get_cdtime (c, &db->expire_delay);
 		else
 			log_warn ("Ignoring unknown config key \"%s\".", c->key);
 	}
@@ -1281,12 +1290,9 @@ static int c_psql_config_database (oconfig_item_t *ci)
 	ssnprintf (cb_name, sizeof (cb_name), "postgresql-%s", db->instance);
 
 	if (db->queries_num > 0) {
-		CDTIME_T_TO_TIMESPEC (db->interval, &cb_interval);
-
 		++db->ref_cnt;
 		plugin_register_complex_read ("postgresql", cb_name, c_psql_read,
-				/* interval = */ (db->interval > 0) ? &cb_interval : NULL,
-				&ud);
+				/* interval = */ db->interval, &ud);
 	}
 	if (db->writers_num > 0) {
 		++db->ref_cnt;