X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fperl.c;h=4a11d6c127c505c2e4b9852aed2f31baac05cc3c;hb=19a7c076959e16df16be966d4c3aa563431ef038;hp=3f430bd1a941a33189f1bdec746dfc8d81b41760;hpb=814f21ff67d1c055d8cdebac7b0ab8daf85c9b66;p=collectd.git

diff --git a/src/perl.c b/src/perl.c
index 3f430bd1..4a11d6c1 100644
--- a/src/perl.c
+++ b/src/perl.c
@@ -185,7 +185,7 @@ extern char **environ;
  * private variables
  */
 
-static int flush_callback_registered = 0;
+static _Bool register_legacy_flush = 1;
 
 /* if perl_threads != NULL perl_threads->head must
  * point to the "base" thread */
@@ -1699,8 +1699,8 @@ static void _plugin_register_generic_userdata (pTHX, int type, const char *desc)
 		ret = plugin_register_notification(pluginname, perl_notify, &userdata);
 	}
 	else if (PLUGIN_FLUSH == type) {
-		if (0 == flush_callback_registered) { /* For collectd-5.6 only, #1731 */
-			flush_callback_registered++;
+		if (1 == register_legacy_flush) { /* For collectd-5.7 only, #1731 */
+			register_legacy_flush = 0;
 			ret = plugin_register_flush("perl", perl_flush, /* user_data = */ NULL);
 		}
 
@@ -2806,8 +2806,8 @@ static int perl_config (oconfig_item_t *ci)
 			current_status = perl_config_includedir (aTHX_ c);
 		else if (0 == strcasecmp (c->key, "Plugin"))
 			current_status = perl_config_plugin (aTHX_ c);
-		else if (0 == strcasecmp (c->key, "DisableOldFlush"))
-			flush_callback_registered++;
+		else if (0 == strcasecmp (c->key, "RegisterLegacyFlush"))
+			cf_util_get_boolean (c, &register_legacy_flush);
 		else
 		{
 			log_warn ("Ignoring unknown config key \"%s\".", c->key);