Fix parameter declaration formatting

Uncrustify always forced insertion of tabs which led to mangled formatting
of the parameters. Placing each part on a separate line seems to work
better and produce a more readable output.
This commit is contained in:
Markus Mäkelä
2019-03-20 18:33:45 +02:00
parent c2fc80f122
commit be13cbc751

View File

@ -251,130 +251,301 @@ static CONFIG_CONTEXT config_context;
// reasons the required and disabled keywords need to be allowed. // reasons the required and disabled keywords need to be allowed.
static const MXS_ENUM_VALUE ssl_values[] = static const MXS_ENUM_VALUE ssl_values[] =
{ {
{"required", {"required", 1 },
1}, {"true", 1 },
{"true", {"yes", 1 },
1}, {"on", 1 },
{"yes", {"1", 1 },
1}, {"disabled", 0 },
{"on", {"false", 0 },
1}, {"no", 0 },
{"1", {"off", 0 },
1}, {"0", 0 },
{"disabled",
0},
{"false",
0},
{"no",
0},
{"off",
0},
{"0",
0},
{NULL} {NULL}
}; };
static const MXS_ENUM_VALUE ssl_version_values[] = static const MXS_ENUM_VALUE ssl_version_values[] =
{ {
{"MAX", {"MAX", 1 },
1},
#ifndef OPENSSL_1_1 #ifndef OPENSSL_1_1
{"TLSv10", {"TLSv10", 1 },
1},
#endif #endif
#ifdef OPENSSL_1_0 #ifdef OPENSSL_1_0
{"TLSv11", {"TLSv11", 1 },
1}, {"TLSv12", 1 },
{"TLSv12",
1},
#endif #endif
{NULL} {NULL}
}; };
const MXS_MODULE_PARAM config_service_params[] = const MXS_MODULE_PARAM config_service_params[] =
{ {
{CN_TYPE, MXS_MODULE_PARAM_STRING, NULL, {
MXS_MODULE_OPT_REQUIRED}, CN_TYPE,
{CN_ROUTER, MXS_MODULE_PARAM_STRING, NULL, MXS_MODULE_PARAM_STRING,
MXS_MODULE_OPT_REQUIRED}, NULL,
{CN_ROUTER_OPTIONS, MXS_MODULE_PARAM_STRING}, MXS_MODULE_OPT_REQUIRED
{CN_SERVERS, MXS_MODULE_PARAM_STRING}, },
{CN_USER, MXS_MODULE_PARAM_STRING},// Not mandatory due to RCAP_TYPE_NO_AUTH {
{CN_PASSWORD, MXS_MODULE_PARAM_STRING},// Not mandatory due to RCAP_TYPE_NO_AUTH CN_ROUTER,
{CN_ENABLE_ROOT_USER, MXS_MODULE_PARAM_BOOL, "false"}, MXS_MODULE_PARAM_STRING,
{CN_MAX_RETRY_INTERVAL, MXS_MODULE_PARAM_COUNT, "3600"}, NULL,
{CN_MAX_CONNECTIONS, MXS_MODULE_PARAM_COUNT, "0"}, MXS_MODULE_OPT_REQUIRED
{CN_CONNECTION_TIMEOUT, MXS_MODULE_PARAM_COUNT, "0"}, },
{CN_AUTH_ALL_SERVERS, MXS_MODULE_PARAM_BOOL, "false"}, {
{CN_STRIP_DB_ESC, MXS_MODULE_PARAM_BOOL, "true"}, CN_ROUTER_OPTIONS,
{CN_LOCALHOST_MATCH_WILDCARD_HOST, MXS_MODULE_PARAM_BOOL, "true"}, MXS_MODULE_PARAM_STRING
{CN_VERSION_STRING, MXS_MODULE_PARAM_STRING}, },
{CN_FILTERS, MXS_MODULE_PARAM_STRING}, {
{CN_WEIGHTBY, MXS_MODULE_PARAM_STRING}, CN_SERVERS,
{CN_LOG_AUTH_WARNINGS, MXS_MODULE_PARAM_BOOL, "true"}, MXS_MODULE_PARAM_STRING
{CN_RETRY_ON_FAILURE, MXS_MODULE_PARAM_BOOL, "true"}, },
{CN_SESSION_TRACK_TRX_STATE, MXS_MODULE_PARAM_BOOL, "false"}, {
{CN_RETAIN_LAST_STATEMENTS, MXS_MODULE_PARAM_INT, "-1"}, CN_USER, // Not mandatory due to RCAP_TYPE_NO_AUTH
{CN_CLUSTER, MXS_MODULE_PARAM_STRING}, MXS_MODULE_PARAM_STRING
},
{
CN_PASSWORD, // Not mandatory due to RCAP_TYPE_NO_AUTH
MXS_MODULE_PARAM_STRING
},
{
CN_ENABLE_ROOT_USER,
MXS_MODULE_PARAM_BOOL,
"false"
},
{
CN_MAX_RETRY_INTERVAL,
MXS_MODULE_PARAM_COUNT,
"3600"
},
{
CN_MAX_CONNECTIONS,
MXS_MODULE_PARAM_COUNT,
"0"
},
{
CN_CONNECTION_TIMEOUT,
MXS_MODULE_PARAM_COUNT,
"0"
},
{
CN_AUTH_ALL_SERVERS,
MXS_MODULE_PARAM_BOOL,
"false"
},
{
CN_STRIP_DB_ESC,
MXS_MODULE_PARAM_BOOL,
"true"
},
{
CN_LOCALHOST_MATCH_WILDCARD_HOST,
MXS_MODULE_PARAM_BOOL,
"true"
},
{
CN_VERSION_STRING,
MXS_MODULE_PARAM_STRING
},
{
CN_FILTERS,
MXS_MODULE_PARAM_STRING
},
{
CN_WEIGHTBY,
MXS_MODULE_PARAM_STRING
},
{
CN_LOG_AUTH_WARNINGS,
MXS_MODULE_PARAM_BOOL,
"true"
},
{
CN_RETRY_ON_FAILURE,
MXS_MODULE_PARAM_BOOL,
"true"
},
{
CN_SESSION_TRACK_TRX_STATE,
MXS_MODULE_PARAM_BOOL,
"false"
},
{
CN_RETAIN_LAST_STATEMENTS,
MXS_MODULE_PARAM_INT,
"-1"
},
{
CN_CLUSTER,
MXS_MODULE_PARAM_STRING
},
{NULL} {NULL}
}; };
const MXS_MODULE_PARAM config_listener_params[] = const MXS_MODULE_PARAM config_listener_params[] =
{ {
{CN_TYPE, MXS_MODULE_PARAM_STRING, NULL, {
MXS_MODULE_OPT_REQUIRED}, CN_TYPE,
{CN_SERVICE, MXS_MODULE_PARAM_SERVICE, NULL, MXS_MODULE_PARAM_STRING,
MXS_MODULE_OPT_REQUIRED}, NULL,
{CN_PROTOCOL, MXS_MODULE_PARAM_STRING, NULL, MXS_MODULE_OPT_REQUIRED
MXS_MODULE_OPT_REQUIRED}, },
{CN_PORT, MXS_MODULE_PARAM_COUNT}, // Either port or socket, {
// checked when created CN_SERVICE,
{CN_SOCKET, MXS_MODULE_PARAM_STRING}, MXS_MODULE_PARAM_SERVICE,
{CN_AUTHENTICATOR_OPTIONS, MXS_MODULE_PARAM_STRING, ""}, NULL,
{CN_ADDRESS, MXS_MODULE_PARAM_STRING, "::"}, MXS_MODULE_OPT_REQUIRED
{CN_AUTHENTICATOR, MXS_MODULE_PARAM_STRING}, },
{CN_SSL, MXS_MODULE_PARAM_ENUM, "false", {
MXS_MODULE_OPT_ENUM_UNIQUE, CN_PROTOCOL,
ssl_values}, MXS_MODULE_PARAM_STRING,
{CN_SSL_CERT, MXS_MODULE_PARAM_PATH, NULL, NULL,
MXS_MODULE_OPT_PATH_R_OK}, MXS_MODULE_OPT_REQUIRED
{CN_SSL_KEY, MXS_MODULE_PARAM_PATH, NULL, },
MXS_MODULE_OPT_PATH_R_OK}, {
{CN_SSL_CA_CERT, MXS_MODULE_PARAM_PATH, NULL, CN_PORT, // Either port or socket, checked when created
MXS_MODULE_OPT_PATH_R_OK}, MXS_MODULE_PARAM_COUNT
{CN_SSL_VERSION, MXS_MODULE_PARAM_ENUM, "MAX", },
MXS_MODULE_OPT_ENUM_UNIQUE, {
ssl_version_values}, CN_SOCKET,
{CN_SSL_CERT_VERIFY_DEPTH, MXS_MODULE_PARAM_COUNT, "9"}, MXS_MODULE_PARAM_STRING
{CN_SSL_VERIFY_PEER_CERTIFICATE, MXS_MODULE_PARAM_BOOL, "true"}, },
{
CN_AUTHENTICATOR_OPTIONS,
MXS_MODULE_PARAM_STRING,
""
},
{
CN_ADDRESS,
MXS_MODULE_PARAM_STRING,
"::"
},
{
CN_AUTHENTICATOR,
MXS_MODULE_PARAM_STRING
},
{
CN_SSL,
MXS_MODULE_PARAM_ENUM,
"false",
MXS_MODULE_OPT_ENUM_UNIQUE,
ssl_values
},
{
CN_SSL_CERT,
MXS_MODULE_PARAM_PATH,
NULL,
MXS_MODULE_OPT_PATH_R_OK
},
{
CN_SSL_KEY,
MXS_MODULE_PARAM_PATH,
NULL,
MXS_MODULE_OPT_PATH_R_OK
},
{
CN_SSL_CA_CERT,
MXS_MODULE_PARAM_PATH,
NULL,
MXS_MODULE_OPT_PATH_R_OK
},
{
CN_SSL_VERSION,
MXS_MODULE_PARAM_ENUM,
"MAX",
MXS_MODULE_OPT_ENUM_UNIQUE,
ssl_version_values
},
{
CN_SSL_CERT_VERIFY_DEPTH,
MXS_MODULE_PARAM_COUNT,
"9"
},
{
CN_SSL_VERIFY_PEER_CERTIFICATE,
MXS_MODULE_PARAM_BOOL,
"true"
},
{NULL} {NULL}
}; };
const MXS_MODULE_PARAM config_monitor_params[] = const MXS_MODULE_PARAM config_monitor_params[] =
{ {
{CN_TYPE, MXS_MODULE_PARAM_STRING, NULL, {
MXS_MODULE_OPT_REQUIRED}, CN_TYPE,
{CN_MODULE, MXS_MODULE_PARAM_STRING, NULL, MXS_MODULE_PARAM_STRING,
MXS_MODULE_OPT_REQUIRED}, NULL,
MXS_MODULE_OPT_REQUIRED
{CN_USER, MXS_MODULE_PARAM_STRING, NULL, },
MXS_MODULE_OPT_REQUIRED}, {
{CN_PASSWORD, MXS_MODULE_PARAM_STRING, NULL,MXS_MODULE_OPT_REQUIRED }, CN_MODULE,
{CN_SERVERS, MXS_MODULE_PARAM_SERVERLIST}, MXS_MODULE_PARAM_STRING,
{CN_MONITOR_INTERVAL, MXS_MODULE_PARAM_COUNT, "2000"}, NULL,
{CN_BACKEND_CONNECT_TIMEOUT, MXS_MODULE_PARAM_COUNT, "3"}, MXS_MODULE_OPT_REQUIRED
{CN_BACKEND_READ_TIMEOUT, MXS_MODULE_PARAM_COUNT, "1"}, },
{CN_BACKEND_WRITE_TIMEOUT, MXS_MODULE_PARAM_COUNT, "2"}, {
{CN_BACKEND_CONNECT_ATTEMPTS, MXS_MODULE_PARAM_COUNT, "1"}, CN_USER,
MXS_MODULE_PARAM_STRING,
{CN_JOURNAL_MAX_AGE, MXS_MODULE_PARAM_COUNT, "28800"}, NULL,
{CN_DISK_SPACE_THRESHOLD, MXS_MODULE_PARAM_STRING}, MXS_MODULE_OPT_REQUIRED
{CN_DISK_SPACE_CHECK_INTERVAL, MXS_MODULE_PARAM_COUNT, "0"}, },
{
{CN_SCRIPT, MXS_MODULE_PARAM_STRING},// Cannot be a path type as CN_PASSWORD,
// the script may have MXS_MODULE_PARAM_STRING,
// parameters NULL,
{CN_SCRIPT_TIMEOUT, MXS_MODULE_PARAM_COUNT, "90"}, MXS_MODULE_OPT_REQUIRED
},
{
CN_SERVERS,
MXS_MODULE_PARAM_SERVERLIST
},
{
CN_MONITOR_INTERVAL,
MXS_MODULE_PARAM_COUNT,
"2000"
},
{
CN_BACKEND_CONNECT_TIMEOUT,
MXS_MODULE_PARAM_COUNT,
"3"
},
{
CN_BACKEND_READ_TIMEOUT,
MXS_MODULE_PARAM_COUNT,
"1"
},
{
CN_BACKEND_WRITE_TIMEOUT,
MXS_MODULE_PARAM_COUNT,
"2"
},
{
CN_BACKEND_CONNECT_ATTEMPTS,
MXS_MODULE_PARAM_COUNT,
"1"
},
{
CN_JOURNAL_MAX_AGE,
MXS_MODULE_PARAM_COUNT,
"28800"
},
{
CN_DISK_SPACE_THRESHOLD,
MXS_MODULE_PARAM_STRING
},
{
CN_DISK_SPACE_CHECK_INTERVAL,
MXS_MODULE_PARAM_COUNT,
"0"
},
{
CN_SCRIPT, // Cannot be a path type as the script may have parameters
MXS_MODULE_PARAM_STRING
},
{
CN_SCRIPT_TIMEOUT,
MXS_MODULE_PARAM_COUNT,
"90"
},
{ {
CN_EVENTS, CN_EVENTS,
MXS_MODULE_PARAM_ENUM, MXS_MODULE_PARAM_ENUM,
@ -387,46 +558,130 @@ const MXS_MODULE_PARAM config_monitor_params[] =
const MXS_MODULE_PARAM config_filter_params[] = const MXS_MODULE_PARAM config_filter_params[] =
{ {
{CN_TYPE, MXS_MODULE_PARAM_STRING, NULL, {
MXS_MODULE_OPT_REQUIRED}, CN_TYPE, MXS_MODULE_PARAM_STRING,
{CN_MODULE, MXS_MODULE_PARAM_STRING, NULL, NULL,
MXS_MODULE_OPT_REQUIRED}, MXS_MODULE_OPT_REQUIRED
},
{
CN_MODULE,
MXS_MODULE_PARAM_STRING,
NULL,
MXS_MODULE_OPT_REQUIRED
},
{NULL} {NULL}
}; };
const MXS_MODULE_PARAM config_server_params[] = const MXS_MODULE_PARAM config_server_params[] =
{ {
{CN_TYPE, MXS_MODULE_PARAM_STRING, NULL, {
MXS_MODULE_OPT_REQUIRED}, CN_TYPE,
{CN_ADDRESS, MXS_MODULE_PARAM_STRING, NULL, MXS_MODULE_PARAM_STRING,
MXS_MODULE_OPT_REQUIRED}, NULL,
{CN_PROTOCOL, MXS_MODULE_PARAM_STRING, NULL, MXS_MODULE_OPT_REQUIRED
MXS_MODULE_OPT_REQUIRED}, },
{CN_PORT, MXS_MODULE_PARAM_COUNT, "3306"}, {
{CN_EXTRA_PORT, MXS_MODULE_PARAM_COUNT, "0"}, CN_ADDRESS,
{CN_AUTHENTICATOR, MXS_MODULE_PARAM_STRING}, MXS_MODULE_PARAM_STRING,
{CN_MONITORUSER, MXS_MODULE_PARAM_STRING}, NULL,
{CN_MONITORPW, MXS_MODULE_PARAM_STRING}, MXS_MODULE_OPT_REQUIRED
{CN_PERSISTPOOLMAX, MXS_MODULE_PARAM_COUNT, "0"}, },
{CN_PERSISTMAXTIME, MXS_MODULE_PARAM_COUNT, "0"}, {
{CN_PROXY_PROTOCOL, MXS_MODULE_PARAM_BOOL, "false"}, CN_PROTOCOL,
{CN_SSL, MXS_MODULE_PARAM_ENUM, "false", MXS_MODULE_PARAM_STRING,
MXS_MODULE_OPT_ENUM_UNIQUE, NULL,
ssl_values}, MXS_MODULE_OPT_REQUIRED
{CN_SSL_CERT, MXS_MODULE_PARAM_PATH, NULL, },
MXS_MODULE_OPT_PATH_R_OK}, {
{CN_SSL_KEY, MXS_MODULE_PARAM_PATH, NULL, CN_PORT,
MXS_MODULE_OPT_PATH_R_OK}, MXS_MODULE_PARAM_COUNT,
{CN_SSL_CA_CERT, MXS_MODULE_PARAM_PATH, NULL, "3306"
MXS_MODULE_OPT_PATH_R_OK}, },
{CN_SSL_VERSION, MXS_MODULE_PARAM_ENUM, "MAX", {
MXS_MODULE_OPT_ENUM_UNIQUE, CN_EXTRA_PORT,
ssl_version_values}, MXS_MODULE_PARAM_COUNT,
{CN_SSL_CERT_VERIFY_DEPTH, MXS_MODULE_PARAM_COUNT, "9"}, "0"
{CN_SSL_VERIFY_PEER_CERTIFICATE, MXS_MODULE_PARAM_BOOL, "true"}, },
{CN_DISK_SPACE_THRESHOLD, MXS_MODULE_PARAM_STRING}, {
{CN_RANK, MXS_MODULE_PARAM_ENUM, DEFAULT_RANK, CN_AUTHENTICATOR,
MXS_MODULE_OPT_ENUM_UNIQUE, rank_values}, MXS_MODULE_PARAM_STRING
},
{
CN_MONITORUSER,
MXS_MODULE_PARAM_STRING
},
{
CN_MONITORPW,
MXS_MODULE_PARAM_STRING
},
{
CN_PERSISTPOOLMAX,
MXS_MODULE_PARAM_COUNT,
"0"
},
{
CN_PERSISTMAXTIME,
MXS_MODULE_PARAM_COUNT,
"0"
},
{
CN_PROXY_PROTOCOL,
MXS_MODULE_PARAM_BOOL,
"false"
},
{
CN_SSL,
MXS_MODULE_PARAM_ENUM,
"false",
MXS_MODULE_OPT_ENUM_UNIQUE,
ssl_values
},
{
CN_SSL_CERT,
MXS_MODULE_PARAM_PATH,
NULL,
MXS_MODULE_OPT_PATH_R_OK
},
{
CN_SSL_KEY,
MXS_MODULE_PARAM_PATH,
NULL,
MXS_MODULE_OPT_PATH_R_OK
},
{
CN_SSL_CA_CERT,
MXS_MODULE_PARAM_PATH,
NULL,
MXS_MODULE_OPT_PATH_R_OK
},
{
CN_SSL_VERSION,
MXS_MODULE_PARAM_ENUM,
"MAX",
MXS_MODULE_OPT_ENUM_UNIQUE,
ssl_version_values
},
{
CN_SSL_CERT_VERIFY_DEPTH,
MXS_MODULE_PARAM_COUNT,
"9"
},
{
CN_SSL_VERIFY_PEER_CERTIFICATE,
MXS_MODULE_PARAM_BOOL,
"true"
},
{
CN_DISK_SPACE_THRESHOLD,
MXS_MODULE_PARAM_STRING
},
{
CN_RANK,
MXS_MODULE_PARAM_ENUM,
DEFAULT_RANK,
MXS_MODULE_OPT_ENUM_UNIQUE,
rank_values
},
{NULL} {NULL}
}; };