Просмотр исходного кода

Move "Totem is unable to form..." message to main

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto@redhat.com>
(backported to flatiron)
Jan Friesse 13 лет назад
Родитель
Сommit
e032c14341
2 измененных файлов с 8 добавлено и 8 удалено
  1. 8 0
      exec/main.c
  2. 0 8
      exec/totemsrp.c

+ 8 - 0
exec/main.c

@@ -646,6 +646,14 @@ static void corosync_totem_stats_updater (void *data)
 		"firewall_enabled_or_nic_failure", strlen("firewall_enabled_or_nic_failure"),
 		&firewall_enabled_or_nic_failure, sizeof (firewall_enabled_or_nic_failure));
 
+	if (stats->mrp->srp->continuous_gather > MAX_NO_CONT_GATHER) {
+		log_printf (LOGSYS_LEVEL_WARNING,
+			"Totem is unable to form a cluster because of an "
+			"operating system or network fault. The most common "
+			"cause of this message is that the local firewall is "
+			"configured improperly.");
+	}
+
 	total_mtt_rx_token = 0;
 	total_token_holdtime = 0;
 	total_backlog_calc = 0;

+ 0 - 8
exec/totemsrp.c

@@ -1929,14 +1929,6 @@ static void memb_state_gather_enter (
 		instance->stats.continuous_gather++;
 	}
 
-	if (instance->stats.continuous_gather > MAX_NO_CONT_GATHER) {
-		log_printf (instance->totemsrp_log_level_warning,
-			"Totem is unable to form a cluster because of an "
-			"operating system or network fault. The most common "
-			"cause of this message is that the local firewall is "
-			"configured improperly.\n");
-	}
-
 	return;
 }