From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 9 Apr 2007 10:57:05 +0000 (+0200)
Subject: src/plugin.c: Ensure that `wait_time' is at least `interval_g'.
X-Git-Tag: collectd-4.0.0-rc4~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=453e6c5da45d5e16376ddbc1564e9065d2897e55;p=collectd.git

src/plugin.c: Ensure that `wait_time' is at least `interval_g'.
---

diff --git a/src/plugin.c b/src/plugin.c
index c927522a..33636507 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -186,6 +186,8 @@ static void *plugin_read_thread (void *args)
 
 			if (status != 0)
 			{
+				if (rf->wait_time < interval_g)
+					rf->wait_time = interval_g;
 				rf->wait_left = rf->wait_time;
 				rf->wait_time = rf->wait_time * 2;
 				if (rf->wait_time > 86400)
@@ -500,8 +502,9 @@ void plugin_init_all (void)
 		{
 			ERROR ("Initialization of plugin `%s' "
 					"failed with status %i. "
-					"Plugin will be unloaded. TODO!",
+					"Plugin will be unloaded.",
 					le->key, status);
+			/* FIXME: Unload _all_ functions */
 			plugin_unregister_read (le->key);
 		}