database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-497 Use CrossEngineSettings section of the XML config for cross-engine connections' TLS settings.

Browse Source
This commit is contained in:
Roman Nozdrin
2018-01-06 16:48:27 +03:00
parent c9ba4ace27
commit 631ba8ff64
5 changed files with 17 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
oam/oamcpp/liboamcpp.cpp
View File

@ -532,9 +532,6 @@ void Oam::getSystemConfig(const std::string& module, ModuleConfig& moduleconfig)
const string MODULE_DISABLE_STATE = "ModuleDisableState";
const string MODULE_DBROOT_COUNT = "ModuleDBRootCount";
const string MODULE_DBROOT_ID = "ModuleDBRootID";
const string MODULE_TLS_CA = "ModuleTLSCA";
const string MODULE_TLS_CL_CERT = "ModuleTLSClientCert";
const string MODULE_TLS_CL_KEY = "ModuleTLSClientKey";
string moduletype = module.substr(0, MAX_MODULE_TYPE_SIZE);
int moduleID = atoi(module.substr(MAX_MODULE_TYPE_SIZE, MAX_MODULE_ID_SIZE).c_str());
@ -609,13 +606,6 @@ void Oam::getSystemConfig(const std::string& module, ModuleConfig& moduleconfig)
sort ( moduleconfig.dbrootConfigList.begin(), moduleconfig.dbrootConfigList.end() );
if ( moduletype == "um" )
{
moduleconfig.TLSCA = sysConfig->getConfig(Section, MODULE_TLS_CA + itoa(moduleTypeID) );
moduleconfig.TLSClientCert = sysConfig->getConfig(Section, MODULE_TLS_CL_CERT + itoa(moduleTypeID) );
moduleconfig.TLSClientKey = sysConfig->getConfig(Section, MODULE_TLS_CL_KEY + itoa(moduleTypeID) );
}
return;
}
}