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

Add more common constants

Browse Source 
Now all relevant and working core configuration parameters have constants
for their names. This removes some of the risk that comes with the
repetition of the same parameter name in more than place.
This commit is contained in:
Markus Mäkelä
2017-04-20 17:00:17 +03:00
committed by Markus Mäkelä
parent 695a4032ca
commit 1e55ee5b2f
3 changed files with 215 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/core/config_runtime.cc
View File

@ -217,7 +217,7 @@ static SSL_LISTENER* create_ssl(const char *name, const char *key, const char *c
if (obj)
{
if (config_add_param(obj, CN_SSL, "required") &&
if (config_add_param(obj, CN_SSL, CN_REQUIRED) &&
config_add_param(obj, CN_SSL_KEY, key) &&
config_add_param(obj, CN_SSL_CERT, cert) &&
config_add_param(obj, CN_SSL_CA_CERT, ca) &&
@ -672,7 +672,7 @@ static bool extract_relations(json_t* json, set<string>& relations,
bool rval = true;
json_t* rel;
if ((rel = json_object_get(json, "relationships")))
if ((rel = json_object_get(json, CN_RELATIONSHIPS)))
{
for (int i = 0; relation_types[i]; i++)
{
@ -742,15 +742,15 @@ static bool server_contains_required_fields(json_t* json)
const char* server_relation_types[] =
{
"services",
"monitors",
CN_SERVICES,
CN_MONITORS,
NULL
};
static bool server_relation_is_valid(const string& type, const string& value)
{
return (type == "services" && service_find(value.c_str())) ||
(type == "monitors" && monitor_find(value.c_str()));
return (type == CN_SERVICES && service_find(value.c_str())) ||
(type == CN_MONITORS && monitor_find(value.c_str()));
}
static bool unlink_server_relations(SERVER* server, set<string>& relations)
@ -834,13 +834,13 @@ static bool monitor_contains_required_fields(json_t* json)
const char* monitor_relation_types[] =
{
"servers",
CN_SERVERS,
NULL
};
static bool monitor_relation_is_valid(const string& type, const string& value)
{
return type == "servers" && server_find_by_unique_name(value.c_str());
return type == CN_SERVERS && server_find_by_unique_name(value.c_str());
}
static bool unlink_monitor_relations(MXS_MONITOR* monitor, set<string>& relations)