fence_xvmd: Support FENCE_XVMD_DEBUG env. variable
PATCH 1/1 fence_xvmd: Support FENCE_XVMD_DEBUG env. variable
Signed-off-by Lon Hohberger <[email protected]>
--- fence/agents/xvm/Makefile | 2 +- fence/agents/xvm/fence_xvmd.c | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-)
fence/agents/xvm/Makefile +1 -1
@@ -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
fence/agents/xvm/fence_xvmd.c +15 -3
@@ -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 ) {
Signature · 1 line
1.6.0.6
PATCH 1/1 fence_xvmd: Support FENCE_XVMD_DEBUG env. variable
Quoted 11 lines · Lon Hohberger
Signed-off-by Lon Hohberger <[email protected]>--- fence/agents/xvm/Makefile | 2 +- fence/agents/xvm/fence_xvmd.c | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-)fence/agents/xvm/Makefile +0
-0
fence/agents/xvm/Makefile STANDALONE_CFLAGS += -DSTANDALONE · line 45
Quoted 5 lines
fence/agents/xvm/Makefile +1
-1@@ -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.
Quoted 41 lines
fence/agents/xvm/Makefile +0
-0EXTRA_LDFLAGS += -L${ccslibdir} -lccs -L${cmanlibdir} -lcman EXTRA_LDFLAGS += -L${virtlibdir} -lvirtfence/agents/xvm/fence_xvmd.c +15
-3@@ -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 ) {
PATCH 1/1 fence_xvmd: Support FENCE_XVMD_DEBUG env. variable
Quoted 13 lines · Fabio M. Di Nitto
Quoted 12 lines · Lon Hohberger
Signed-off-by Lon Hohberger <[email protected]>--- fence/agents/xvm/Makefile | 2 +- fence/agents/xvm/fence_xvmd.c | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-)fence/agents/xvm/Makefile +0
-0@@ -42,7 +42,7 @@ STANDALONE_CFLAGS += -DSTANDALONE
Quoted 4 lines
fence/agents/xvm/Makefile STANDALONE_CFLAGS += -DSTANDALONE · line 45
Quoted 4 lines
fence/agents/xvm/Makefile +1
-1LDFLAGS += -L${nsslibdir} -lnss3 LDFLAGS += -L${logtlibdir} -llogthread -LDFLAGS += -L${libdir} +LDFLAGS += -L${libdir} -lconfdb
Sorry, I will revert this part.
-- Lon