Browse Source

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>
Jan Friesse 13 years ago
parent
commit
d042671369
2 changed files with 8 additions and 8 deletions
  1. 8 0
      exec/main.c
  2. 0 8
      exec/totemsrp.c

+ 8 - 0
exec/main.c

@@ -494,6 +494,14 @@ static void corosync_totem_stats_updater (void *data)
 	icmap_set_uint8("runtime.totem.pg.mrp.srp.firewall_enabled_or_nic_failure",
 		stats->mrp->srp->continuous_gather > MAX_NO_CONT_GATHER ? 1 : 0);
 
+	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.");
+	}
+
 	for (i = 0; i < stats->mrp->srp->rrp->interface_count; i++) {
 		snprintf(key_name, ICMAP_KEYNAME_MAXLEN, "runtime.totem.pg.mrp.rrp.%u.faulty", i);
 		icmap_set_uint8(key_name, stats->mrp->srp->rrp->faulty[i]);

+ 0 - 8
exec/totemsrp.c

@@ -1988,14 +1988,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.");
-	}
-
 	return;
 }