From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10676 invoked by alias); 31 Mar 2009 15:50:09 -0000 Received: (qmail 10638 invoked by alias); 31 Mar 2009 15:50:08 -0000 X-SWARE-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_43,J_CHICKENPOX_45,SPF_HELO_PASS X-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_43,J_CHICKENPOX_45,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: cluster: STABLE3 - fence_xvmd: Support FENCE_XVMD_DEBUG env. variable To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 37a6d3de81f7fcfcf32d2d3f3bb3351360c61ea4 X-Git-Newrev: 7d18d35f94112eecc40ad7ff760f1ba4b580dab6 From: Lon Hohberger Message-Id: <20090331153444.2AF4F120197@lists.fedorahosted.org> Date: Tue, 31 Mar 2009 15:50:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg01000.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7d18d35f94112eecc40ad7ff760f1ba4b580dab6 Commit: 7d18d35f94112eecc40ad7ff760f1ba4b580dab6 Parent: 37a6d3de81f7fcfcf32d2d3f3bb3351360c61ea4 Author: Lon Hohberger AuthorDate: Mon Mar 30 16:36:43 2009 -0400 Committer: Lon Hohberger CommitterDate: Tue Mar 31 11:29:05 2009 -0400 fence_xvmd: Support FENCE_XVMD_DEBUG env. variable Signed-off-by: Lon Hohberger Signed-off-by: Fabio M. Di Nitto --- fence/agents/xvm/fence_xvmd.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) 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 at all implies debug == 1 */ + + args.flags |= F_DEBUG; + args.debug = x; + } args_get_getopt(argc, argv, my_options, &args); if (args.flags & F_HELP) {