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:
Markus Mäkelä
2019-07-10 08:14:56 +03:00
parent 4d5b9cae9c 8a176d64aa
commit f9b1a0a0c4
10 changed files with 89 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/service.cc
View File

@ -1091,8 +1091,10 @@ bool Service::refresh_users()
MXS_CONFIG* config = config_get_global_options();
/* Check if refresh rate limit has been exceeded */
if (now < m_rate_limits[self].last + config->users_refresh_time)
/* Check if refresh rate limit has been exceeded. Also check whether we are in the middle of starting up.
* If so, allow repeated reloading of users. */
if (now > maxscale_started() + config->users_refresh_time
&& now < m_rate_limits[self].last + config->users_refresh_time)
{
if (!m_rate_limits[self].warned)
{