From mboxrd@z Thu Jan 1 00:00:00 1970 From: fabbione@sourceware.org Date: 3 Jul 2008 04:21:05 -0000 Subject: [Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.05-44-g0f7e7fb Message-ID: <20080703042105.2799.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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=0f7e7fbf0cfd01bec02df4ee2527fb39ed846dc3 The branch, master has been updated via 0f7e7fbf0cfd01bec02df4ee2527fb39ed846dc3 (commit) from a66be490568c86f1b4345407e20897d44a4f59c5 (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 0f7e7fbf0cfd01bec02df4ee2527fb39ed846dc3 Author: Fabio M. Di Nitto Date: Thu Jul 3 06:20:30 2008 +0200 [MISC] Use default configured SYSLOGLEVEL across the tree Signed-off-by: Fabio M. Di Nitto ----------------------------------------------------------------------- Summary of changes: ccs/daemon/ccsd.c | 2 +- ccs/daemon/misc.c | 4 ++-- cman/qdisk/daemon_init.c | 2 +- cman/qdisk/disk.c | 2 +- cman/qdisk/disk_util.c | 2 +- cman/qdisk/main.c | 8 ++++---- cman/qdisk/mkqdisk.c | 2 +- cman/qdisk/proc.c | 2 +- cman/qdisk/score.c | 2 +- fence/agents/xvm/debug.c | 2 +- fence/agents/xvm/fence_xvm.c | 2 +- fence/agents/xvm/fence_xvmd.c | 8 ++++---- fence/agents/xvm/ip_lookup.c | 2 +- fence/agents/xvm/mcast.c | 2 +- fence/agents/xvm/options.c | 2 +- fence/agents/xvm/simple_auth.c | 2 +- fence/agents/xvm/tcp.c | 2 +- fence/agents/xvm/virt.c | 2 +- fence/agents/xvm/xml.c | 2 +- fence/fence_node/fence_node.c | 2 +- 20 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ccs/daemon/ccsd.c b/ccs/daemon/ccsd.c index ae6854c..89e9e5e 100644 --- a/ccs/daemon/ccsd.c +++ b/ccs/daemon/ccsd.c @@ -46,7 +46,7 @@ LOGSYS_DECLARE_SYSTEM (NULL, LOGDIR "/ccs.log", SYSLOGFACILITY); -LOGSYS_DECLARE_SUBSYS ("CCS", LOG_LEVEL_INFO); +LOGSYS_DECLARE_SUBSYS ("CCS", SYSLOGLEVEL); int main(int argc, char *argv[]){ int i,error=0; diff --git a/ccs/daemon/misc.c b/ccs/daemon/misc.c index 57eb601..89f04d2 100644 --- a/ccs/daemon/misc.c +++ b/ccs/daemon/misc.c @@ -150,7 +150,7 @@ fail: * Returns: -1 on failure. NULL on success. */ int set_ccs_logging(xmlDocPtr ldoc){ - int facility = SYSLOGFACILITY, loglevel = LOG_LEVEL_INFO, global_debug = 0; + int facility = SYSLOGFACILITY, loglevel = SYSLOGLEVEL, global_debug = 0; char *res = NULL, *error = NULL; xmlXPathContextPtr ctx = NULL; unsigned int logmode; @@ -197,7 +197,7 @@ int set_ccs_logging(xmlDocPtr ldoc){ if(res) { loglevel = logsys_priority_id_get (res); if (loglevel < 0) - loglevel = LOG_LEVEL_INFO; + loglevel = SYSLOGLEVEL; if(!debug) { if(loglevel == LOG_LEVEL_DEBUG) diff --git a/cman/qdisk/daemon_init.c b/cman/qdisk/daemon_init.c index 2534f1c..2185cad 100644 --- a/cman/qdisk/daemon_init.c +++ b/cman/qdisk/daemon_init.c @@ -37,7 +37,7 @@ int check_process_running(char *prog, pid_t * pid); static void update_pidfile(char *prog); static int setup_sigmask(void); -LOGSYS_DECLARE_SUBSYS ("QDISK", LOG_LEVEL_INFO); +LOGSYS_DECLARE_SUBSYS ("QDISK", SYSLOGLEVEL); static int check_pid_valid(pid_t pid, char *prog) diff --git a/cman/qdisk/disk.c b/cman/qdisk/disk.c index dce8bd4..463cf2a 100644 --- a/cman/qdisk/disk.c +++ b/cman/qdisk/disk.c @@ -30,7 +30,7 @@ static int diskRawRead(target_info_t *disk, char *buf, int len); uint32_t clu_crc32(const char *data, size_t count); -LOGSYS_DECLARE_SUBSYS ("QDISK", LOG_LEVEL_INFO); +LOGSYS_DECLARE_SUBSYS ("QDISK", SYSLOGLEVEL); /** * Swap the bytes of a shared header so that it's always in big-endian form diff --git a/cman/qdisk/disk_util.c b/cman/qdisk/disk_util.c index 47614d3..07faa39 100644 --- a/cman/qdisk/disk_util.c +++ b/cman/qdisk/disk_util.c @@ -17,7 +17,7 @@ #include #include -LOGSYS_DECLARE_SUBSYS ("QDISK", LOG_LEVEL_INFO); +LOGSYS_DECLARE_SUBSYS ("QDISK", SYSLOGLEVEL); inline void _diff_tv(struct timeval *dest, struct timeval *start, struct timeval *end) diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c index 75ccafe..d132cbd 100644 --- a/cman/qdisk/main.c +++ b/cman/qdisk/main.c @@ -61,7 +61,7 @@ LOGSYS_DECLARE_SYSTEM (NULL, LOGDIR "/qdisk.log", SYSLOGFACILITY); -LOGSYS_DECLARE_SUBSYS ("QDISK", LOG_LEVEL_INFO); +LOGSYS_DECLARE_SUBSYS ("QDISK", SYSLOGLEVEL); static void int_handler(int sig) @@ -1062,7 +1062,7 @@ quorum_logout(qd_ctx *ctx) static int get_logsys_config_data(int *debug) { - int ccsfd = -1, loglevel = LOG_LEVEL_INFO, facility = SYSLOGFACILITY; + int ccsfd = -1, loglevel = SYSLOGLEVEL, facility = SYSLOGFACILITY; char *val = NULL, *error = NULL; unsigned int logmode; int global_debug = 0; @@ -1106,7 +1106,7 @@ get_logsys_config_data(int *debug) if (ccs_get(ccsfd, "/cluster/logging/logger_subsys[@subsys=\"QDISK\"]/@syslog_level", &val) == 0) { loglevel = logsys_priority_id_get (val); if (loglevel < 0) - loglevel = LOG_LEVEL_INFO; + loglevel = SYSLOGLEVEL; if (!*debug) { if (loglevel == LOG_LEVEL_DEBUG) @@ -1121,7 +1121,7 @@ get_logsys_config_data(int *debug) if (ccs_get(ccsfd, "/cluster/quorumd/@log_level", &val) == 0) { /* check backward compat options */ loglevel = logsys_priority_id_get (val); if (loglevel < 0) - loglevel = LOG_LEVEL_INFO; + loglevel = SYSLOGLEVEL; log_printf(LOG_ERR, " #include "debug.h" -LOGSYS_DECLARE_SUBSYS("XVM", LOG_LEVEL_INFO); +LOGSYS_DECLARE_SUBSYS("XVM", SYSLOGLEVEL); static int _debug = 0; diff --git a/fence/agents/xvm/fence_xvm.c b/fence/agents/xvm/fence_xvm.c index 3b0f8a4..aa94cf2 100644 --- a/fence/agents/xvm/fence_xvm.c +++ b/fence/agents/xvm/fence_xvm.c @@ -43,7 +43,7 @@ LOGSYS_DECLARE_SYSTEM (NULL, LOGDIR "/fence_xvm.log", SYSLOGFACILITY); -LOGSYS_DECLARE_SUBSYS ("XVM", LOG_LEVEL_INFO); +LOGSYS_DECLARE_SUBSYS ("XVM", SYSLOGLEVEL); int tcp_wait_connect(int lfd, int retry_tenths) diff --git a/fence/agents/xvm/fence_xvmd.c b/fence/agents/xvm/fence_xvmd.c index 678abc4..bb336df 100644 --- a/fence/agents/xvm/fence_xvmd.c +++ b/fence/agents/xvm/fence_xvmd.c @@ -49,7 +49,7 @@ LOGSYS_DECLARE_SYSTEM (NULL, LOGDIR "/fence_xvmd.log", SYSLOGFACILITY); -LOGSYS_DECLARE_SUBSYS ("XVM", LOG_LEVEL_INFO); +LOGSYS_DECLARE_SUBSYS ("XVM", SYSLOGLEVEL); int cleanup_xml(char *xmldesc, char **ret, size_t *retsz); @@ -761,7 +761,7 @@ log_config_done(int logmode) static int get_logsys_config_data(int *debug) { - int ccsfd = -1, loglevel = LOG_LEVEL_NOTICE, facility = SYSLOGFACILITY; + int ccsfd = -1, loglevel = SYSLOGLEVEL, facility = SYSLOGFACILITY; char *val = NULL, *error = NULL; unsigned int logmode = 0; int global_debug = 0; @@ -805,7 +805,7 @@ get_logsys_config_data(int *debug) if (ccs_get(ccsfd, "/cluster/logging/logger_subsys[@subsys=\"XVM\"]/@syslog_level", &val) == 0) { loglevel = logsys_priority_id_get (val); if (loglevel < 0) - loglevel = LOG_LEVEL_INFO; + loglevel = SYSLOGLEVEL; if (!*debug) { if (loglevel == LOG_LEVEL_DEBUG) @@ -820,7 +820,7 @@ get_logsys_config_data(int *debug) if (ccs_get(ccsfd, "/cluster/fence_xvmd/@log_level", &val) == 0) { /* check backward compat options */ loglevel = logsys_priority_id_get (val); if (loglevel < 0) - loglevel = LOG_LEVEL_INFO; + loglevel = SYSLOGLEVEL; log_printf(LOG_ERR, "