projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.6' into collectd-4.7
[collectd.git]
/
src
/
rrdtool.c
diff --git
a/src/rrdtool.c
b/src/rrdtool.c
index
98ec666
..
243a8c8
100644
(file)
--- a/
src/rrdtool.c
+++ b/
src/rrdtool.c
@@
-601,7
+601,7
@@
static int rrd_cache_flush_identifier (int timeout, const char *identifier)
status = c_avl_get (cache, key, (void *) &rc);
if (status != 0)
{
status = c_avl_get (cache, key, (void *) &rc);
if (status != 0)
{
-
WARNING
("rrdtool plugin: rrd_cache_flush_identifier: "
+
INFO
("rrdtool plugin: rrd_cache_flush_identifier: "
"c_avl_get (%s) failed. Does that file really exist?",
key);
return (status);
"c_avl_get (%s) failed. Does that file really exist?",
key);
return (status);
@@
-1025,8
+1025,13
@@
static int rrd_shutdown (void)
static int rrd_init (void)
{
static int rrd_init (void)
{
+ static int init_once = 0;
int status;
int status;
+ if (init_once != 0)
+ return (0);
+ init_once = 1;
+
if (rrdcreate_config.stepsize < 0)
rrdcreate_config.stepsize = 0;
if (rrdcreate_config.heartbeat <= 0)
if (rrdcreate_config.stepsize < 0)
rrdcreate_config.stepsize = 0;
if (rrdcreate_config.heartbeat <= 0)