X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fpostgresql.c;h=8b6094923c448b3a1060a7f1752bd8f4e7f4bca2;hb=c76419c0cf983f1ecd3d36aa236cc4e3f9cff733;hp=7e69877c43e132ab776205574a97f2503a043099;hpb=f0d468892e1c173b226f739be48291981473b4fb;p=collectd.git diff --git a/src/postgresql.c b/src/postgresql.c index 7e69877c..8b609492 100644 --- a/src/postgresql.c +++ b/src/postgresql.c @@ -34,7 +34,6 @@ #include "common.h" -#include "configfile.h" #include "plugin.h" #include "utils_cache.h" @@ -834,7 +833,7 @@ static int c_psql_write (const data_set_t *ds, const value_list_t *vl, assert (db->database != NULL); assert (db->writers != NULL); - if (rfc3339nano (time_str, sizeof (time_str), vl->time) != 0) { + if (rfc3339nano_local (time_str, sizeof (time_str), vl->time) != 0) { log_err ("c_psql_write: Failed to convert time to RFC 3339 format"); return -1; } @@ -1177,8 +1176,6 @@ static int c_psql_config_database (oconfig_item_t *ci) c_psql_database_t *db; char cb_name[DATA_MAX_NAME_LEN]; - user_data_t ud = { 0 }; - static _Bool have_flush = 0; if ((1 != ci->values_num) @@ -1261,11 +1258,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->instance); + user_data_t ud = { + .data = db, + .free_func = c_psql_database_delete + }; + if (db->queries_num > 0) { ++db->ref_cnt; plugin_register_complex_read ("postgresql", cb_name, c_psql_read,