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

MXS-2329 Use durations with query_retry_timeout

Browse Source 
Also change auth_[connect|read|write]_timeout to be time_t.
This commit is contained in:
Johan Wikman
2019-04-26 17:00:45 +03:00
parent 92cc31f0c0
commit 3055e49f5a
4 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
server/core/config_runtime.cc
View File

@ -838,14 +838,14 @@ bool runtime_alter_maxscale(const char* name, const char* value)
if (key == CN_AUTH_CONNECT_TIMEOUT)
{
int intval = get_positive_int(value);
if (intval)
time_t timeout = get_positive_int(value);
if (timeout)
{
MXS_NOTICE("Updated '%s' from %d to %d",
MXS_NOTICE("Updated '%s' from %ld to %ld",
CN_AUTH_CONNECT_TIMEOUT,
cnf.auth_conn_timeout,
intval);
cnf.auth_conn_timeout = intval;
timeout);
cnf.auth_conn_timeout = timeout;
rval = true;
}
else
@ -855,14 +855,14 @@ bool runtime_alter_maxscale(const char* name, const char* value)
}
else if (key == CN_AUTH_READ_TIMEOUT)
{
int intval = get_positive_int(value);
if (intval)
time_t timeout = get_positive_int(value);
if (timeout)
{
MXS_NOTICE("Updated '%s' from %d to %d",
MXS_NOTICE("Updated '%s' from %ld to %ld",
CN_AUTH_READ_TIMEOUT,
cnf.auth_read_timeout,
intval);
cnf.auth_read_timeout = intval;
timeout);
cnf.auth_read_timeout = timeout;
rval = true;
}
else
@ -872,14 +872,14 @@ bool runtime_alter_maxscale(const char* name, const char* value)
}
else if (key == CN_AUTH_WRITE_TIMEOUT)
{
int intval = get_positive_int(value);
if (intval)
time_t timeout = get_positive_int(value);
if (timeout)
{
MXS_NOTICE("Updated '%s' from %d to %d",
MXS_NOTICE("Updated '%s' from %ld to %ld",
CN_AUTH_WRITE_TIMEOUT,
cnf.auth_write_timeout,
intval);
cnf.auth_write_timeout = intval;
timeout);
cnf.auth_write_timeout = timeout;
rval = true;
}
else