public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* Cluster Project branch, master, updated. cluster-2.99.05-40-gf80715e
@ 2008-07-02 18:57 lhh
0 siblings, 0 replies; only message in thread
From: lhh @ 2008-07-02 18:57 UTC (permalink / raw)
To: cluster-cvs, cluster-devel
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=f80715e00a254edc1d42831df05abea8f0ebf6d0
The branch, master has been updated
via f80715e00a254edc1d42831df05abea8f0ebf6d0 (commit)
from 9e40fc5f3e25a47eb469fd8e89874d28f755cd86 (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 f80715e00a254edc1d42831df05abea8f0ebf6d0
Author: Lon Hohberger <lhh@redhat.com>
Date: Wed Jul 2 14:57:28 2008 -0400
[fence] Make fence_xvm[d] use normal log levels
It used LOG_NOTICE for info-level and LOG_INFO
for debug-level notices due to noise from logsys
which has now been resolved in the trunk of
openais.
-----------------------------------------------------------------------
Summary of changes:
fence/agents/xvm/debug.c | 2 +-
fence/agents/xvm/debug.h | 10 +---------
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 +-
11 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/fence/agents/xvm/debug.c b/fence/agents/xvm/debug.c
index 6b75053..0867490 100644
--- a/fence/agents/xvm/debug.c
+++ b/fence/agents/xvm/debug.c
@@ -1,7 +1,7 @@
#include <stdio.h>
#include "debug.h"
-LOGSYS_DECLARE_SUBSYS("XVM", LOG_LEVEL_NOTICE);
+LOGSYS_DECLARE_SUBSYS("XVM", LOG_LEVEL_INFO);
static int _debug = 0;
diff --git a/fence/agents/xvm/debug.h b/fence/agents/xvm/debug.h
index 0a1f99b..419bd73 100644
--- a/fence/agents/xvm/debug.h
+++ b/fence/agents/xvm/debug.h
@@ -6,18 +6,10 @@
inline void dset(int);
inline int dget(void);
-/*
- * Intentionally uses LOG_INFO for debugging if debugging is specified
- * because logsys's debugging level dumps immense amounts of noise to
- * the log (such as the full path to the file at compile-time and line #)
- *
- * Specify >10 if you want this information.
- */
-
#define dbg_printf(level, fmt, args...) \
do { \
if (dget()>=level) \
- log_printf(dget()>10?LOG_DEBUG:LOG_INFO, fmt, ##args); \
+ log_printf(LOG_DEBUG, fmt, ##args); \
} while(0)
#endif
diff --git a/fence/agents/xvm/fence_xvm.c b/fence/agents/xvm/fence_xvm.c
index 89823a9..3b0f8a4 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_NOTICE);
+LOGSYS_DECLARE_SUBSYS ("XVM", LOG_LEVEL_INFO);
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 b14c58a..678abc4 100644
--- a/fence/agents/xvm/fence_xvmd.c
+++ b/fence/agents/xvm/fence_xvmd.c
@@ -43,12 +43,13 @@ static int reload_key;
LOGSYS_DECLARE_SYSTEM (NULL,
LOG_MODE_OUTPUT_STDERR |
LOG_MODE_OUTPUT_SYSLOG_THREADED |
+ LOG_MODE_SHORT_FILELINE |
LOG_MODE_OUTPUT_FILE |
LOG_MODE_BUFFER_BEFORE_CONFIG,
LOGDIR "/fence_xvmd.log",
SYSLOGFACILITY);
-LOGSYS_DECLARE_SUBSYS ("XVM", LOG_LEVEL_NOTICE);
+LOGSYS_DECLARE_SUBSYS ("XVM", LOG_LEVEL_INFO);
int cleanup_xml(char *xmldesc, char **ret, size_t *retsz);
@@ -762,7 +763,7 @@ get_logsys_config_data(int *debug)
{
int ccsfd = -1, loglevel = LOG_LEVEL_NOTICE, facility = SYSLOGFACILITY;
char *val = NULL, *error = NULL;
- unsigned int logmode;
+ unsigned int logmode = 0;
int global_debug = 0;
log_printf(LOG_DEBUG, "Loading logsys configuration information\n");
@@ -917,7 +918,7 @@ main(int argc, char **argv)
{
fence_xvm_args_t args;
int mc_sock;
- unsigned int logmode;
+ unsigned int logmode = 0;
char key[MAX_KEY_LEN];
int key_len = 0, x;
char *my_options = "dfi:a:p:C:U:c:k:u?hLXV";
@@ -951,6 +952,7 @@ main(int argc, char **argv)
get_logsys_config_data(&args.debug);
} else {
logmode = logsys_config_mode_get();
+ logmode &= ~LOG_MODE_DISPLAY_FILELINE;
log_config_done(logmode);
}
diff --git a/fence/agents/xvm/ip_lookup.c b/fence/agents/xvm/ip_lookup.c
index 51f8588..cbd5ac3 100644
--- a/fence/agents/xvm/ip_lookup.c
+++ b/fence/agents/xvm/ip_lookup.c
@@ -22,7 +22,7 @@
#include "ip_lookup.h"
#include "debug.h"
-LOGSYS_DECLARE_SUBSYS("XVM", LOG_LEVEL_NOTICE);
+LOGSYS_DECLARE_SUBSYS("XVM", LOG_LEVEL_INFO);
static int
send_addr_dump(int fd, int family)
diff --git a/fence/agents/xvm/mcast.c b/fence/agents/xvm/mcast.c
index 30f19bd..aa4bfb9 100644
--- a/fence/agents/xvm/mcast.c
+++ b/fence/agents/xvm/mcast.c
@@ -25,7 +25,7 @@
#include "mcast.h"
#include "debug.h"
-LOGSYS_DECLARE_SUBSYS ("XVM", LOG_LEVEL_NOTICE);
+LOGSYS_DECLARE_SUBSYS ("XVM", LOG_LEVEL_INFO);
/**
Sets up a multicast receive socket
diff --git a/fence/agents/xvm/options.c b/fence/agents/xvm/options.c
index 3f7f6eb..553c956 100644
--- a/fence/agents/xvm/options.c
+++ b/fence/agents/xvm/options.c
@@ -25,7 +25,7 @@
#include "options.h"
#include "debug.h"
-LOGSYS_DECLARE_SUBSYS("XVM", LOG_LEVEL_NOTICE);
+LOGSYS_DECLARE_SUBSYS("XVM", LOG_LEVEL_INFO);
/* Assignment functions */
diff --git a/fence/agents/xvm/simple_auth.c b/fence/agents/xvm/simple_auth.c
index cfa96cd..36f3d70 100644
--- a/fence/agents/xvm/simple_auth.c
+++ b/fence/agents/xvm/simple_auth.c
@@ -13,7 +13,7 @@
#include "simple_auth.h"
#include "debug.h"
-LOGSYS_DECLARE_SUBSYS("XVM", LOG_LEVEL_NOTICE);
+LOGSYS_DECLARE_SUBSYS("XVM", LOG_LEVEL_INFO);
void
print_hash(unsigned char *hash, size_t hashlen)
diff --git a/fence/agents/xvm/tcp.c b/fence/agents/xvm/tcp.c
index 92bb8b1..ab693bb 100644
--- a/fence/agents/xvm/tcp.c
+++ b/fence/agents/xvm/tcp.c
@@ -16,7 +16,7 @@
#include "debug.h"
-LOGSYS_DECLARE_SUBSYS("XVM", LOG_LEVEL_NOTICE);
+LOGSYS_DECLARE_SUBSYS("XVM", LOG_LEVEL_INFO);
static int connect_nb(int fd, struct sockaddr *dest, socklen_t len, int timeout);
diff --git a/fence/agents/xvm/virt.c b/fence/agents/xvm/virt.c
index 7aed0a3..2d5659b 100644
--- a/fence/agents/xvm/virt.c
+++ b/fence/agents/xvm/virt.c
@@ -9,7 +9,7 @@
#include "virt.h"
#include "debug.h"
-LOGSYS_DECLARE_SUBSYS("XVM", LOG_LEVEL_NOTICE);
+LOGSYS_DECLARE_SUBSYS("XVM", LOG_LEVEL_INFO);
static int
_compare_virt(const void *_left, const void *_right)
diff --git a/fence/agents/xvm/xml.c b/fence/agents/xvm/xml.c
index 7977dfa..651eb4e 100644
--- a/fence/agents/xvm/xml.c
+++ b/fence/agents/xvm/xml.c
@@ -15,7 +15,7 @@
#include "debug.h"
#endif
-LOGSYS_DECLARE_SUBSYS("XVM", LOG_LEVEL_NOTICE);
+LOGSYS_DECLARE_SUBSYS("XVM", LOG_LEVEL_INFO);
xmlNodePtr
hooks/post-receive
--
Cluster Project
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-07-02 18:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-07-02 18:57 Cluster Project branch, master, updated. cluster-2.99.05-40-gf80715e lhh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).