* [Cluster-devel] [PATCH] fence_xvmd: Support FENCE_XVMD_DEBUG env. variable
@ 2009-03-30 21:14 Lon Hohberger
2009-03-31 5:19 ` Fabio M. Di Nitto
0 siblings, 1 reply; 3+ messages in thread
From: Lon Hohberger @ 2009-03-30 21:14 UTC (permalink / raw)
To: cluster-devel.redhat.com
Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Cluster-devel] [PATCH] fence_xvmd: Support FENCE_XVMD_DEBUG env. variable
2009-03-30 21:14 [Cluster-devel] [PATCH] fence_xvmd: Support FENCE_XVMD_DEBUG env. variable Lon Hohberger
@ 2009-03-31 5:19 ` Fabio M. Di Nitto
2009-03-31 14:36 ` Lon Hohberger
0 siblings, 1 reply; 3+ messages in thread
From: Fabio M. Di Nitto @ 2009-03-31 5:19 UTC (permalink / raw)
To: cluster-devel.redhat.com
On Mon, 2009-03-30 at 17:14 -0400, Lon Hohberger wrote:
> Signed-off-by: Lon Hohberger <lhh@redhat.com>
> ---
> 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
Why are you linking with confdb???? If you need it, then the snippet
needs to be different.
The patch looks good otherwise.
>
> 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 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) {
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Cluster-devel] [PATCH] fence_xvmd: Support FENCE_XVMD_DEBUG env. variable
2009-03-31 5:19 ` Fabio M. Di Nitto
@ 2009-03-31 14:36 ` Lon Hohberger
0 siblings, 0 replies; 3+ messages in thread
From: Lon Hohberger @ 2009-03-31 14:36 UTC (permalink / raw)
To: cluster-devel.redhat.com
On Tue, 2009-03-31 at 07:19 +0200, Fabio M. Di Nitto wrote:
> On Mon, 2009-03-30 at 17:14 -0400, Lon Hohberger wrote:
> > Signed-off-by: Lon Hohberger <lhh@redhat.com>
> > ---
> > 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
Sorry, I will revert this part.
-- Lon
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-03-31 14:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-30 21:14 [Cluster-devel] [PATCH] fence_xvmd: Support FENCE_XVMD_DEBUG env. variable Lon Hohberger
2009-03-31 5:19 ` Fabio M. Di Nitto
2009-03-31 14:36 ` Lon Hohberger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.