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

diff --git a/src/plugin.c b/src/plugin.c
index c927522afe14f8940cdc08a1ec1a7015a8f7897e..33636507b1656c9c6d30692bb50f9c0b300ba318 100644 (file)
--- 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);
                }