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

Merge branch '2.2' into 2.2-mrm

Browse Source
This commit is contained in:
Markus Mäkelä
2017-10-30 11:06:34 +02:00
parent 41cd0cd6d7 a971aa25da
commit 3a78b716b8
49 changed files with 1458 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/maxscale/config.h
View File

@ -32,7 +32,7 @@ MXS_BEGIN_DECLS
/** Default port where the REST API listens */
#define DEFAULT_ADMIN_HTTP_PORT 8989
#define DEFAULT_ADMIN_HOST "::"
#define DEFAULT_ADMIN_HOST "127.0.0.1"
#define RELEASE_STR_LENGTH 256
#define SYSNAME_LEN 256
@ -158,6 +158,7 @@ extern const char CN_SSL_CERT_VERIFY_DEPTH[];
extern const char CN_SSL_KEY[];
extern const char CN_SSL_VERSION[];
extern const char CN_STRIP_DB_ESC[];
extern const char CN_SUBSTITUTE_VARIABLES[];
extern const char CN_THREADS[];
extern const char CN_THREAD_STACK_SIZE[];
extern const char CN_TYPE[];
@ -228,6 +229,7 @@ typedef struct
char admin_ssl_ca_cert[PATH_MAX]; /**< Admin SSL CA cert */
int query_retries; /**< Number of times a interrupted query is retried */
time_t query_retry_timeout; /**< Timeout for query retries */
bool substitute_variables; /**< Should environment variables be substituted */
} MXS_CONFIG;
/**

2
include/maxscale/monitor.h
View File

@ -340,7 +340,7 @@ json_t* monitor_list_to_json(const char* host);
* @param server Server to inspect
* @param host Hostname of this server
*
* @return Array of monitor links
* @return Array of monitor links or NULL if no relations exist
*/
json_t* monitor_relations_to_server(const SERVER* server, const char* host);

2
include/maxscale/service.h
View File

@ -341,7 +341,7 @@ json_t* service_listener_to_json(const SERVICE* service, const char* name, const
* @param server Server to inspect
* @param host Hostname of this server
*
* @return Array of service links
* @return Array of service links or NULL if no relations exist
*/
json_t* service_relations_to_server(const SERVER* server, const char* host);