Skip to content

Commit

Permalink
Fixed the default tracing mode.
Browse files Browse the repository at this point in the history
It should stay disabled if no HEP detination was set for that MI backend. Use the -1 marker as disabled as the 0 values is actually a valid one.
Reported by Ben Newlin

(cherry picked from commit 8a46fbf)
  • Loading branch information
bogdan-iancu committed Apr 4, 2018
1 parent d6d19e0 commit 3ae3b4b
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion mi/mi_trace.c
Expand Up @@ -374,7 +374,7 @@ int allow_mi_cmd_trace(int id, char* name, int len)

unsigned char is_mi_cmd_traced(int id, struct mi_cmd* cmd)
{
return (1 << id) & *cmd->trace_mask;
return (id < 0)? 0 : (1 << id) & *cmd->trace_mask;
}

/**
Expand Down
3 changes: 2 additions & 1 deletion modules/mi_datagram/mi_datagram.c
Expand Up @@ -98,7 +98,8 @@ static char *mi_reply_indent = DEFAULT_MI_REPLY_IDENT;
static str trace_destination_name = {NULL, 0};
trace_dest t_dst;

int mi_trace_mod_id;
/* tracing is disabled by default */
int mi_trace_mod_id = -1;
char* mi_trace_bwlist_s;


Expand Down
3 changes: 2 additions & 1 deletion modules/mi_fifo/mi_fifo.c
Expand Up @@ -66,7 +66,8 @@ static int read_buf_size = MAX_MI_FIFO_READ;
static str trace_destination_name = {NULL, 0};
trace_dest t_dst;

int mi_trace_mod_id;
/* tracing is disabled by default */
int mi_trace_mod_id = -1;
char* mi_trace_bwlist_s;


Expand Down
3 changes: 2 additions & 1 deletion modules/mi_http/mi_http.c
Expand Up @@ -54,7 +54,8 @@ static str trace_destination_name = {NULL, 0};
trace_dest t_dst;
extern http_mi_cmd_t* http_mi_cmds;

int mi_trace_mod_id;
/* tracing is disabled by default */
int mi_trace_mod_id = -1;
char* mi_trace_bwlist_s;


Expand Down
3 changes: 2 additions & 1 deletion modules/mi_json/mi_json.c
Expand Up @@ -52,7 +52,8 @@ httpd_api_t httpd_api;
static str trace_destination_name = {NULL, 0};
trace_dest t_dst;

int mi_trace_mod_id;
/* tracing is disabled by default */
int mi_trace_mod_id = -1;
char* mi_trace_bwlist_s;

static const str MI_HTTP_U_ERROR = str_init("Internal server error");
Expand Down
3 changes: 2 additions & 1 deletion modules/mi_xmlrpc_ng/mi_xmlrpc_http.c
Expand Up @@ -90,7 +90,8 @@ static str backend = str_init("xmlrpc");

static union sockaddr_union* sv_socket = NULL;

int mi_trace_mod_id;
/* tracing is disabled by default */
int mi_trace_mod_id = -1;
char* mi_trace_bwlist_s;

#define MI_XML_ERROR_BUF_MAX_LEN 1024
Expand Down

0 comments on commit 3ae3b4b

Please sign in to comment.