[Debian-ha-commits] [pacemaker] 02/05: Medium: crmd: Delay starting the IPC server until we're fully functional

[Christoph Berg]

This is an automated email from the git hooks/post-receive script.

myon pushed a commit to tag Pacemaker-0.6.1
in repository pacemaker.

commit e37211890b2c09a405498e6a2532f81711eab6e9
Author: Andrew Beekhof <andrew at beekhof.net>
Date:   Tue Feb 5 10:14:56 2008 +0100

    Medium: crmd: Delay starting the IPC server until we're fully functional
    
    Mercurial revision: dae6a9eb7f0f2d61567a9f327dbaba46d87cebab
---
 crmd/control.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/crmd/control.c b/crmd/control.c
index 7003f43..c8b57ec 100644
--- a/crmd/control.c
+++ b/crmd/control.c
@@ -424,14 +424,6 @@ do_startup(long long action,
 	fsa_cib_conn = cib_new();
 	fsa_lrm_conn = ll_lrm_new(XML_CIB_TAG_LRM);	
 	
-	crm_debug("Init server comms");
-	if(ipc_server == NULL) {
-		ipc_server = crm_strdup(CRM_SYSTEM_CRMD);
-	}
-
-	was_error = init_server_ipc_comms(ipc_server, crmd_client_connect,
-					  default_ipc_connection_destroy);
-
 	/* set up the timers */
 	crm_malloc0(integration_timer, sizeof(fsa_timer_t));
 	crm_malloc0(finalization_timer, sizeof(fsa_timer_t));
@@ -665,6 +657,17 @@ do_started(long long action,
 		return;
 	}
 
+	crm_debug("Init server comms");
+	if(ipc_server == NULL) {
+		ipc_server = crm_strdup(CRM_SYSTEM_CRMD);
+	}
+
+	if(init_server_ipc_comms(ipc_server, crmd_client_connect,
+				 default_ipc_connection_destroy)) {
+	    crm_err("Couldn't start IPC server");
+	    register_fsa_error(C_FSA_INTERNAL, I_ERROR, NULL);
+	}
+
 	crm_info("The local CRM is operational");
 	clear_bit_inplace(fsa_input_register, R_STARTING);
 	register_fsa_input(msg_data->fsa_cause, I_PENDING, NULL);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pacemaker.git