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

MXS-2481 Ensure directory exists before creating db

Browse Source
This commit is contained in:
Johan Wikman
2019-05-23 14:43:38 +03:00
parent 8a2c43d297
commit 8204c5099b
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
server/modules/monitor/clustrixmon/clustrixmonitor.cc
View File

@ -146,6 +146,10 @@ sqlite3* open_or_create_db(const std::string& path)
{ {
MXS_ERROR("Opening/creating the sqlite3 database %s failed: %s", MXS_ERROR("Opening/creating the sqlite3 database %s failed: %s",
path.c_str(), sqlite3_errstr(rv)); path.c_str(), sqlite3_errstr(rv));
MXS_ERROR("Could not open sqlite3 database for storing information "
"about dynamically detected Clustrix nodes. The Clustrix "
"monitor will remain dependant upon statically defined "
"bootstrap nodes.");
} }
return pDb; return pDb;
@ -170,20 +174,21 @@ ClustrixMonitor* ClustrixMonitor::create(const string& name, const string& modul
path += "/"; path += "/";
path += name; path += name;
if (!mxs_mkdir_all(path.c_str(), 0744))
{
MXS_ERROR("Could not create the directory %s, MaxScale will not be "
"able to create database for persisting connection "
"information of dynamically detected Clustrix nodes.",
path.c_str());
}
path += "/clustrix_nodes-v"; path += "/clustrix_nodes-v";
path += std::to_string(SCHEMA_VERSION); path += std::to_string(SCHEMA_VERSION);
path += ".db"; path += ".db";
sqlite3* pDb = open_or_create_db(path); sqlite3* pDb = open_or_create_db(path);
if (!pDb)
{
MXS_WARNING("Could not open sqlite3 database for storing information "
"about dynamically detected Clustrix nodes. The Clustrix "
"monitor will remain dependant upon statically defined "
"bootstrap nodes.");
}
return new ClustrixMonitor(name, module, pDb); return new ClustrixMonitor(name, module, pDb);
} }