hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Marko
2019-07-28 21:43:58 +03:00
parent d4b712ae84 918a2964d5
commit a9b01ff4cc
20 changed files with 199 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
server/core/config.cc
View File

@ -172,6 +172,7 @@ const char CN_SERVER[] = "server";
const char CN_SERVICES[] = "services";
const char CN_SERVICE[] = "service";
const char CN_SESSIONS[] = "sessions";
const char CN_SESSION_TRACE[] = "session_trace";
const char CN_SESSION_TRACK_TRX_STATE[] = "session_track_trx_state";
const char CN_SKIP_PERMISSION_CHECKS[] = "skip_permission_checks";
const char CN_SOCKET[] = "socket";
@ -393,6 +394,11 @@ const MXS_MODULE_PARAM config_service_params[] =
MXS_MODULE_PARAM_INT,
"-1"
},
{
CN_SESSION_TRACE,
MXS_MODULE_PARAM_BOOL,
"false"
},
{
CN_CLUSTER,
MXS_MODULE_PARAM_STRING
@ -2729,6 +2735,21 @@ static int handle_global_item(const char* name, const char* value)
return 0;
}
}
else if (strcmp(name, CN_SESSION_TRACE) == 0)
{
char* endptr;
int intval = strtol(value, &endptr, 0);
if (*endptr == '\0' && intval >= 0)
{
session_set_session_trace(intval);
mxb_log_set_session_trace(true);
}
else
{
MXS_ERROR("Invalid value for '%s': %s", CN_SESSION_TRACE, value);
return 0;
}
}
else if (strcmp(name, CN_LOAD_PERSISTED_CONFIGS) == 0)
{
int b = config_truth_value(value);