[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.05-50-gb9bfda9

[ccaulfield at sourceware.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=b9bfda9d714c43d75854c6077f92f936c5acd081

The branch, master has been updated
       via  b9bfda9d714c43d75854c6077f92f936c5acd081 (commit)
      from  c418d299d477fe52359022796c9336f1ef862cc8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b9bfda9d714c43d75854c6077f92f936c5acd081
Author: Christine Caulfield <ccaulfie at redhat.com>
Date:   Fri Jul 4 09:47:49 2008 +0100

    [CMAN] Remove some redundant code.
    
    Signed-off-by: Christine Caulfield <ccaulfie at redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 cman/daemon/cman-preconfig.c |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index 26adf55..4d9e196 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -521,7 +521,7 @@ static int get_nodename(struct objdb_iface_ver0 *objdb)
 
 	}
 
-	/* Add <cman nodename> */
+	/* Add <cman> bits to pass down to the main module*/
 	if ( (node_object_handle = nodelist_byname(objdb, cluster_parent_handle, nodename))) {
 		if (objdb_get_string(objdb, node_object_handle, "nodeid", &nodeid_str)) {
 			sprintf(error_reason, "This node has no nodeid in cluster.conf");
@@ -730,10 +730,6 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb)
 						 LOGDIR "/cman.log", strlen(LOGDIR "/cman.log")+1);
 		}
 
-		objdb->object_key_create(object_handle, "syslog_facility", strlen("syslog_facility"),
-					 "local4", strlen("local4")+1);
-
-
 		if (debug_mask) {
 			objdb->object_key_create(object_handle, "to_stderr", strlen("to_stderr"),
 						 "yes", strlen("yes")+1);
@@ -945,10 +941,6 @@ static int cmanpre_readconfig(struct objdb_iface_ver0 *objdb, char **error_strin
 	if (getenv("CMAN_PIPE"))
                 startup_pipe = atoi(getenv("CMAN_PIPE"));
 
-	/* We need to set this up to internal defaults too early */
-	openlog("openais", LOG_CONS|LOG_PID, SYSLOGFACILITY);
-
-
 	objdb->object_find_reset(OBJECT_PARENT_HANDLE);
         objdb->object_find(OBJECT_PARENT_HANDLE,
 			   "cluster", strlen("cluster"), &cluster_parent_handle);


hooks/post-receive
--
Cluster Project