[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.05-51-g0e0d1b9

[fabbione@sourceware.org <fabbione@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=0e0d1b960e8d03c921170862adc52c7e122a5f22

The branch, master has been updated
       via  0e0d1b960e8d03c921170862adc52c7e122a5f22 (commit)
      from  b9bfda9d714c43d75854c6077f92f936c5acd081 (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 0e0d1b960e8d03c921170862adc52c7e122a5f22
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Fri Jul 4 10:51:41 2008 +0200

    [MISC] Fix logging file query
    
    This fix the config key from filename to logfile as it is supposed to
    be.
    
    I misread the openais documentation on this specific bit and ended using
    filename instead of logfile.
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

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

Summary of changes:
 ccs/daemon/misc.c             |    6 +++---
 cman/qdisk/main.c             |    6 +++---
 fence/agents/xvm/fence_xvmd.c |    6 +++---
 fence/fenced/logging.c        |    4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ccs/daemon/misc.c b/ccs/daemon/misc.c
index 89f04d2..0a9cb07 100644
--- a/ccs/daemon/misc.c
+++ b/ccs/daemon/misc.c
@@ -251,14 +251,14 @@ int set_ccs_logging(xmlDocPtr ldoc){
     res=NULL;
   }
 
-  res = do_simple_xml_query(ctx, "/cluster/logging/@filename");
+  res = do_simple_xml_query(ctx, "/cluster/logging/@logfile");
   if(res) {
     if(logsys_config_file_set(&error, res))
-      log_printf(LOG_ERR, "filename: unable to open %s for logging\n", res);
+      log_printf(LOG_ERR, "logfile: unable to open %s for logging\n", res);
     free(res);
     res=NULL;
   } else
-      log_printf(LOG_DEBUG, "filename: use default built-in log file: %s\n", LOGDIR "/ccs.log");
+      log_printf(LOG_DEBUG, "logfile: use default built-in log file: %s\n", LOGDIR "/ccs.log");
 
   res = do_simple_xml_query(ctx, "/cluster/logging/@syslog_facility");
   if(res) {
diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index d132cbd..b630efd 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -1174,13 +1174,13 @@ get_logsys_config_data(int *debug)
 		val = NULL;
 	}
 
-	if (ccs_get(ccsfd, "/cluster/logging/@filename", &val) == 0) {
+	if (ccs_get(ccsfd, "/cluster/logging/@logfile", &val) == 0) {
 		if(logsys_config_file_set(&error, val))
-			log_printf(LOG_ERR, "filename: unable to open %s for logging\n", val);
+			log_printf(LOG_ERR, "logfile: unable to open %s for logging\n", val);
 		free(val);
 		val = NULL;
 	} else
-		log_printf(LOG_DEBUG, "filename: use default built-in log file: %s\n", LOGDIR "/qdisk.log");
+		log_printf(LOG_DEBUG, "logfile: use default built-in log file: %s\n", LOGDIR "/qdisk.log");
 
 	if (ccs_get(ccsfd, "/cluster/logging/@syslog_facility", &val) == 0) {
 		facility = logsys_facility_id_get (val);
diff --git a/fence/agents/xvm/fence_xvmd.c b/fence/agents/xvm/fence_xvmd.c
index bb336df..888f24b 100644
--- a/fence/agents/xvm/fence_xvmd.c
+++ b/fence/agents/xvm/fence_xvmd.c
@@ -873,13 +873,13 @@ get_logsys_config_data(int *debug)
 		val = NULL;
 	}
 
-	if (ccs_get(ccsfd, "/cluster/logging/@filename", &val) == 0) {
+	if (ccs_get(ccsfd, "/cluster/logging/@logfile", &val) == 0) {
 		if(logsys_config_file_set(&error, val))
-			log_printf(LOG_ERR, "filename: unable to open %s for logging\n", val);
+			log_printf(LOG_ERR, "logfile: unable to open %s for logging\n", val);
 		free(val);
 		val = NULL;
 	} else
-		log_printf(LOG_DEBUG, "filename: use default built-in log file: %s\n", LOGDIR "/fence_xvmd.log");
+		log_printf(LOG_DEBUG, "logfile: use default built-in log file: %s\n", LOGDIR "/fence_xvmd.log");
 
 	if (ccs_get(ccsfd, "/cluster/logging/@syslog_facility", &val) == 0) {
 		facility = logsys_facility_id_get (val);
diff --git a/fence/fenced/logging.c b/fence/fenced/logging.c
index ed4af39..aee3485 100644
--- a/fence/fenced/logging.c
+++ b/fence/fenced/logging.c
@@ -24,7 +24,7 @@
    "/cluster/logging/logger_subsys[@subsys=\"prog_name\"]/@syslog_level"
 
    file from
-   "/cluster/logging/@filename"
+   "/cluster/logging/@logfile"
 
    debug from
    "/cluster/logging/@debug"
@@ -105,7 +105,7 @@ static int read_ccs_logging(int *mode, int *facility, int *priority, char *file,
 	strcpy(file, DEFAULT_FILE);
 
 	memset(name, 0, sizeof(name));
-	read_ccs_name("/cluster/logging/@filename", name);
+	read_ccs_name("/cluster/logging/@logfile", name);
 
 	if (name[0])
 		strcpy(file, name);


hooks/post-receive
--
Cluster Project