From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lon Hohberger Date: Mon, 30 Mar 2009 17:14:14 -0400 Subject: [Cluster-devel] [PATCH] fence_xvmd: Support FENCE_XVMD_DEBUG env. variable Message-ID: <1238447654-20059-1-git-send-email-lhh@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Signed-off-by: Lon Hohberger --- fence/agents/xvm/Makefile | 2 +- fence/agents/xvm/fence_xvmd.c | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/fence/agents/xvm/Makefile b/fence/agents/xvm/Makefile index cbabda0..2d8f627 100644 --- a/fence/agents/xvm/Makefile +++ b/fence/agents/xvm/Makefile @@ -42,7 +42,7 @@ STANDALONE_CFLAGS += -DSTANDALONE LDFLAGS += -L${nsslibdir} -lnss3 LDFLAGS += -L${logtlibdir} -llogthread -LDFLAGS += -L${libdir} +LDFLAGS += -L${libdir} -lconfdb EXTRA_LDFLAGS += -L${ccslibdir} -lccs -L${cmanlibdir} -lcman EXTRA_LDFLAGS += -L${virtlibdir} -lvirt diff --git a/fence/agents/xvm/fence_xvmd.c b/fence/agents/xvm/fence_xvmd.c index 4e427ad..8fd35cf 100644 --- a/fence/agents/xvm/fence_xvmd.c +++ b/fence/agents/xvm/fence_xvmd.c @@ -862,18 +862,30 @@ int main(int argc, char **argv) { fence_xvm_args_t args; - int mc_sock; char key[MAX_KEY_LEN]; - int key_len = 0, x; char *my_options = "dfi:a:p:I:C:U:c:k:u?hLXV"; - cman_handle_t ch = NULL; void *h = NULL; + char *dbgp = getenv("FENCE_XVMD_DEBUG"); + cman_handle_t ch = NULL; + int key_len = 0, x, mc_sock; /* Start w/ stderr output only */ conf_logging(0, LOG_MODE_OUTPUT_STDERR, SYSLOGFACILITY, SYSLOGLEVEL, SYSLOGLEVEL, NULL); args_init(&args); + + /* Grab debug level from our environment variable, + * if specified. + */ + if (dbgp) { + x = atoi(dbgp); + if (x <= 0) + x = 1; /* Being set@all implies debug == 1 */ + + args.flags |= F_DEBUG; + args.debug = x; + } args_get_getopt(argc, argv, my_options, &args); if (args.flags & F_HELP) { -- 1.6.0.6