[Spread-cvs] commit: r624 - branches/spread_4_2_debug/daemon

[jschultz at spread.org]

Author: jschultz
Date: 2013-11-18 12:22:16 -0500 (Mon, 18 Nov 2013)
New Revision: 624

Modified:
   branches/spread_4_2_debug/daemon/protocol.c
Log:
Further minor cleanups


Modified: branches/spread_4_2_debug/daemon/protocol.c
===================================================================
--- branches/spread_4_2_debug/daemon/protocol.c	2013-11-18 17:18:16 UTC (rev 623)
+++ branches/spread_4_2_debug/daemon/protocol.c	2013-11-18 17:22:16 UTC (rev 624)
@@ -669,10 +669,10 @@
 
 	/* calculating Aru */
 	if( Token->aru > Last_token->aru ) {
-		Alarm(MEMB, "Prot_handle_token: updating Aru from Last_token; Aru %d -> %d\n", Aru, Last_token->aru);
+	        /*Alarmp( SPLOG_INFO, PROTOCOL, "Prot_handle_token: updating Aru from Last_token; Aru %d -> %d\n", Aru, Last_token->aru );*/
 		Aru = Last_token->aru;
 	} else {
-		Alarm(MEMB, "Prot_handle_token: updating Aru from Token; Aru %d -> %d\n", Aru, Token->aru);
+	        /*Alarmp( SPLOG_INFO, PROTOCOL, "Prot_handle_token: updating Aru from Token; Aru %d -> %d\n", Aru, Token->aru );*/
 		Aru = Token->aru;
 	}
 	if( Highest_seq == Aru ) Token_counter++;
@@ -1293,7 +1293,8 @@
         if( Conf_in_reload_singleton_state() ) {
                 /* GOP state equals value 1, but is private declaration in groups.c */
                 if ( (GlobalStatus.gstate != 1 ) || ( Conf_num_procs( &Reg_membership ) != 1 ) ) {
-                        Alarmp( SPLOG_FATAL, MEMB, "Discard_packets: Failed to reload configuration - gstate: %d and num_procs in membership: %d\n", GlobalStatus.gstate, Conf_num_procs( &Reg_membership) );
+                        Alarmp( SPLOG_FATAL, PROTOCOL, "Discard_packets: Failed to reload configuration - gstate: %d and num_procs in membership: %d\n", 
+				GlobalStatus.gstate, Conf_num_procs( &Reg_membership) );
                 }
                 Net_clear_partition();
                 E_queue( Memb_lookup_new_members, 0, NULL, Zero_timeout);
@@ -1319,7 +1320,7 @@
             Last_delivered	 = 0;
         }
 
-	Alarmp( SPLOG_INFO, MEMB, "Discard_packets: Updated Aru to %d for next membership\n", Aru );
+	/*Alarmp( SPLOG_INFO, PROTOCOL, "Discard_packets: Updated Aru to %d for next membership\n", Aru );*/
 
 	GlobalStatus.my_aru	 = My_aru;
 	Token_counter 	= 0;