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

MXS-2329 0 is a valid duration, with or without a suffix

Browse Source
This commit is contained in:
Johan Wikman
2019-04-29 13:20:03 +03:00
parent 0f5972e010
commit ca51316364
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/core/config.cc
View File

@ -5115,7 +5115,28 @@ static bool duration_is_valid(const char* zValue, mxs::config::DurationUnit* pUn
{
// When the validity is checked, it does not matter how the value
// should be interpreted, so any mxs::config::DurationInterpretation is fine.
return get_suffixed_duration(zValue, mxs::config::INTERPRET_AS_SECONDS, nullptr, pUnit);
std::chrono::milliseconds duration;
mxs::config::DurationUnit unit;
bool valid = get_suffixed_duration(zValue, mxs::config::INTERPRET_AS_SECONDS, &duration, &unit);
if (valid)
{
if (unit == mxs::config::DURATION_IN_DEFAULT)
{
// "0" is a special case, as it means the same regardless of the
// unit and the presence of a unit.
if (duration.count() == 0)
{
// To prevent unnecessary complaints, we claim it was specified in
// seconds which is acceptable in all cases.
unit = mxs::config::DURATION_IN_SECONDS;
}
}
*pUnit = unit;
}
return valid;
}
static bool get_seconds(const char* zName, const char* zValue, std::chrono::seconds* pSeconds)