experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debug -D msg: dont show length in detailed debug

Browse source
This commit is contained in:
Olof hagsand 2024-11-23 10:53:46 +01:00
parent 0193186272
commit 030dd89b83
3 changed files with 33 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/netconf/netconf_main.c
View file

@ -476,8 +476,10 @@ netconf_input_cb(int s,
cbmsg = NULL; cbmsg = NULL;
break; break;
} }
clixon_debug(CLIXON_DBG_MSG, "Recv ext len: %lu", cbuf_len(cbmsg)); if (clixon_debug_isset(CLIXON_DBG_DETAIL))
clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv ext: %s", cbuf_get(cbmsg)); clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv ext: %s", cbuf_get(cbmsg));
else
clixon_debug(CLIXON_DBG_MSG, "Recv ext len: %lu", cbuf_len(cbmsg));
if ((ret = netconf_input_frame2(cbmsg, YB_RPC, yspec, &xtop, &xerr)) < 0) if ((ret = netconf_input_frame2(cbmsg, YB_RPC, yspec, &xtop, &xerr)) < 0)
goto done; goto done;
cbuf_reset(cbmsg); cbuf_reset(cbmsg);

6
lib/src/clixon_netconf_lib.c
View file

@ -2203,8 +2203,10 @@ netconf_output(int s,
char *buf = cbuf_get(cb); char *buf = cbuf_get(cb);
int len = cbuf_len(cb); int len = cbuf_len(cb);
clixon_debug(CLIXON_DBG_MSG, "Send ext len: %lu", cbuf_len(cb)); if (clixon_debug_isset(CLIXON_DBG_DETAIL))
clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Send ext: %s", cbuf_get(cb)); clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Send ext: %s", cbuf_get(cb));
else
clixon_debug(CLIXON_DBG_MSG, "Send ext len: %lu", cbuf_len(cb));
#if 0 // Extra sanity check for debugging #if 0 // Extra sanity check for debugging
{ {
cxobj *xt = NULL; cxobj *xt = NULL;

37
lib/src/clixon_proto.c
View file

@ -354,12 +354,16 @@ clixon_msg_send(int s,
int retval = -1; int retval = -1;
if (descr){ if (descr){
clixon_debug(CLIXON_DBG_MSG, "Send [%s] len: %lu", descr, cbuf_len(cb)); if (clixon_debug_isset(CLIXON_DBG_DETAIL))
clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Send [%s] %s", descr, cbuf_get(cb)); clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Send [%s] %s", descr, cbuf_get(cb));
else
clixon_debug(CLIXON_DBG_MSG, "Send [%s] len: %lu", descr, cbuf_len(cb));
} }
else{ else{
clixon_debug(CLIXON_DBG_MSG, "Send len: %lu", cbuf_len(cb)); if (clixon_debug_isset(CLIXON_DBG_DETAIL))
clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Send %s", cbuf_get(cb)); clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Send %s", cbuf_get(cb));
else
clixon_debug(CLIXON_DBG_MSG, "Send len: %lu", cbuf_len(cb));
} }
if (atomicio((ssize_t (*)(int, void *, size_t))write, if (atomicio((ssize_t (*)(int, void *, size_t))write,
@ -433,12 +437,16 @@ clixon_msg_rcv10(int s,
} }
else { else {
if (descr){ if (descr){
clixon_debug(CLIXON_DBG_MSG, "Recv [%s] len: %lu", descr, cbuf_len(cb)); if (clixon_debug_isset(CLIXON_DBG_DETAIL))
clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv [%s]: %s", descr, cbuf_get(cb)); clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv [%s]: %s", descr, cbuf_get(cb));
else
clixon_debug(CLIXON_DBG_MSG, "Recv [%s] len: %lu", descr, cbuf_len(cb));
} }
else{ else{
clixon_debug(CLIXON_DBG_MSG, "Recv len: %lu", cbuf_len(cb)); if (clixon_debug_isset(CLIXON_DBG_DETAIL))
clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv: %s", cbuf_get(cb)); clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv: %s", cbuf_get(cb));
else
clixon_debug(CLIXON_DBG_MSG, "Recv len: %lu", cbuf_len(cb));
} }
} }
@ -612,12 +620,17 @@ clixon_msg_rcv11(int s,
} }
else { else {
if (descr){ if (descr){
clixon_debug(CLIXON_DBG_MSG, "Recv [%s] len: %lu", descr, cbuf_len(cbmsg)); if (clixon_debug_isset(CLIXON_DBG_DETAIL))
clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv [%s]: %s", descr, cbuf_get(cbmsg)); clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv [%s]: %s", descr, cbuf_get(cbmsg));
else
clixon_debug(CLIXON_DBG_MSG, "Recv [%s] len: %lu", descr, cbuf_len(cbmsg));
} }
else{ else{
clixon_debug(CLIXON_DBG_MSG, "Recv len: %lu", cbuf_len(cbmsg)); if (clixon_debug_isset(CLIXON_DBG_DETAIL))
clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv: %s", cbuf_get(cbmsg)); clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv: %s", cbuf_get(cbmsg));
else
clixon_debug(CLIXON_DBG_MSG, "Recv len: %lu", cbuf_len(cbmsg));
} }
} }