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

MXS-2329 Use durations with persistmaxtime

Browse Source
This commit is contained in:
Johan Wikman
2019-04-29 12:27:51 +03:00
parent 93e130bb48
commit b1a495b342
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/core/config.cc
View File

@ -645,8 +645,9 @@ const MXS_MODULE_PARAM config_server_params[] =
},
{
CN_PERSISTMAXTIME,
MXS_MODULE_PARAM_COUNT,
"0"
MXS_MODULE_PARAM_DURATION,
"0",
MXS_MODULE_OPT_DURATION_S
},
{
CN_PROXY_PROTOCOL,

2
server/core/server.cc
View File

@ -255,7 +255,7 @@ Server* Server::server_alloc(const char* name, MXS_CONFIG_PARAMETER* params)
server->port = params->get_integer(CN_PORT);
server->extra_port = params->get_integer(CN_EXTRA_PORT);
server->m_settings.persistpoolmax = params->get_integer(CN_PERSISTPOOLMAX);
server->m_settings.persistmaxtime = params->get_integer(CN_PERSISTMAXTIME);
server->m_settings.persistmaxtime = params->get_duration<std::chrono::seconds>(CN_PERSISTMAXTIME).count();
server->proxy_protocol = params->get_bool(CN_PROXY_PROTOCOL);
server->is_active = true;
server->m_auth_instance = auth_instance;