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ä
2020-08-19 12:20:49 +03:00
parent 797ddc77e0 b5fa26e8a6
commit f3d4c27e58
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
maxutils/maxbase/src/log.cc
View File

@ -641,6 +641,11 @@ bool mxb_log_rotate()
unused = freopen(this_unit.sLogger->filename(), "a", stderr);
}
if (rval)
{
MXB_NOTICE("Log rotation complete");
}
return rval;
}

17
server/core/config.cc
View File

@ -1159,6 +1159,7 @@ static bool config_load_single_file(const char* file,
*/
static CONFIG_CONTEXT* current_ccontext;
static DUPLICATE_CONTEXT* current_dcontext;
static std::unordered_set<std::string> hidden_dirs;
/**
* The nftw callback.
@ -1204,12 +1205,25 @@ int config_cb(const char* fpath, const struct stat* sb, int typeflag, struct FTW
}
}
if (typeflag == FTW_D)
{
// Hidden directory or a directory inside a hidden directory
if (fpath[ftwbuf->base] == '.' || hidden_dirs.count(std::string(fpath, fpath + ftwbuf->base - 1)))
{
hidden_dirs.insert(fpath);
}
}
if (typeflag == FTW_F) // We are only interested in files,
{
const char* filename = fpath + ftwbuf->base;
const char* dot = strrchr(filename, '.');
if (dot && *filename != '.') // that have a suffix and are not hidden,
if (hidden_dirs.count(std::string(fpath, fpath + ftwbuf->base - 1)))
{
MXS_INFO("Ignoring file inside hidden directory: %s", fpath);
}
else if (dot && *filename != '.') // that have a suffix and are not hidden,
{
const char* suffix = dot + 1;
@ -1256,6 +1270,7 @@ static bool config_load_dir(const char* dir, DUPLICATE_CONTEXT* dcontext, CONFIG
int rv = nftw(dir, config_cb, nopenfd, FTW_PHYS);
current_ccontext = NULL;
current_dcontext = NULL;
hidden_dirs.clear();
return rv == 0;
}