aherman
/
proxysql
mirror of https://github.com/sysown/proxysql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add serverhost when connecting to MySQL Servers

Browse Source
pull/2185/head
Yiyao Jiang 7 years ago
parent a132b34f23
commit 6fdac8c700
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
lib/MySQL_Monitor.cpp
Unescape View File

@ -895,7 +895,7 @@ bool MySQL_Monitor_State_Data::create_new_connection() {
if (timeout==0) timeout=1;
mysql_options(mysql, MYSQL_OPT_CONNECT_TIMEOUT, &timeout);
mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", "proxysql_monitor");
mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "_server_name", hostname);
mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "_server_host", hostname);
MYSQL *myrc=NULL;
if (port) {
myrc=mysql_real_connect(mysql, hostname, mysql_thread___monitor_username, mysql_thread___monitor_password, NULL, port, NULL, 0);

10
lib/ProxySQL_Cluster.cpp
Unescape View File

@ -94,7 +94,7 @@ void * ProxySQL_Cluster_Monitor_thread(void *args) {
mysql_options(conn, MYSQL_OPT_CONNECT_TIMEOUT, &timeout);
mysql_options(conn, MYSQL_OPT_READ_TIMEOUT, &timeout_long);
mysql_options(conn, MYSQL_OPT_WRITE_TIMEOUT, &timeout);
mysql_options4(conn, MYSQL_OPT_CONNECT_ATTR_ADD, "_server_name", node->hostname);
mysql_options4(conn, MYSQL_OPT_CONNECT_ATTR_ADD, "_server_host", node->hostname);
//rc_conn = mysql_real_connect(conn, node->hostname, username, password, NULL, node->port, NULL, CLIENT_COMPRESS); // FIXME: add optional support for compression
rc_conn = mysql_real_connect(conn, node->hostname, username, password, NULL, node->port, NULL, 0);
//char *query = query1;
@ -614,7 +614,7 @@ void ProxySQL_Cluster::pull_mysql_query_rules_from_peer() {
mysql_options(conn, MYSQL_OPT_CONNECT_TIMEOUT, &timeout);
mysql_options(conn, MYSQL_OPT_READ_TIMEOUT, &timeout_long);
mysql_options(conn, MYSQL_OPT_WRITE_TIMEOUT, &timeout);
mysql_options4(conn, MYSQL_OPT_CONNECT_ATTR_ADD, "_server_name", hostname);
mysql_options4(conn, MYSQL_OPT_CONNECT_ATTR_ADD, "_server_host", hostname);
proxy_info("Cluster: Fetching MySQL Query Rules from peer %s:%d started\n", hostname, port);
rc_conn = mysql_real_connect(conn, hostname, username, password, NULL, port, NULL, 0);
if (rc_conn) {
@ -767,7 +767,7 @@ void ProxySQL_Cluster::pull_mysql_users_from_peer() {
mysql_options(conn, MYSQL_OPT_CONNECT_TIMEOUT, &timeout);
mysql_options(conn, MYSQL_OPT_READ_TIMEOUT, &timeout_long);
mysql_options(conn, MYSQL_OPT_WRITE_TIMEOUT, &timeout);
mysql_options4(conn, MYSQL_OPT_CONNECT_ATTR_ADD, "_server_name", hostname);
mysql_options4(conn, MYSQL_OPT_CONNECT_ATTR_ADD, "_server_host", hostname);
proxy_info("Cluster: Fetching MySQL Users from peer %s:%d started\n", hostname, port);
rc_conn = mysql_real_connect(conn, hostname, username, password, NULL, port, NULL, 0);
if (rc_conn) {
@ -850,7 +850,7 @@ void ProxySQL_Cluster::pull_mysql_servers_from_peer() {
mysql_options(conn, MYSQL_OPT_CONNECT_TIMEOUT, &timeout);
mysql_options(conn, MYSQL_OPT_READ_TIMEOUT, &timeout_long);
mysql_options(conn, MYSQL_OPT_WRITE_TIMEOUT, &timeout);
mysql_options4(conn, MYSQL_OPT_CONNECT_ATTR_ADD, "_server_name", hostname);
mysql_options4(conn, MYSQL_OPT_CONNECT_ATTR_ADD, "_server_host", hostname);
proxy_info("Cluster: Fetching MySQL Servers from peer %s:%d started. Expected checksum %s\n", hostname, port, peer_checksum);
rc_conn = mysql_real_connect(conn, hostname, username, password, NULL, port, NULL, 0);
if (rc_conn) {
@ -995,7 +995,7 @@ void ProxySQL_Cluster::pull_proxysql_servers_from_peer() {
mysql_options(conn, MYSQL_OPT_CONNECT_TIMEOUT, &timeout);
mysql_options(conn, MYSQL_OPT_READ_TIMEOUT, &timeout_long);
mysql_options(conn, MYSQL_OPT_WRITE_TIMEOUT, &timeout);
mysql_options4(conn, MYSQL_OPT_CONNECT_ATTR_ADD, "_server_name", hostname);
mysql_options4(conn, MYSQL_OPT_CONNECT_ATTR_ADD, "_server_host", hostname);
proxy_info("Cluster: Fetching ProxySQL Servers from peer %s:%d started\n", hostname, port);
rc_conn = mysql_real_connect(conn, hostname, username, password, NULL, port, NULL, 0);
if (rc_conn) {

2
lib/mysql_connection.cpp
Unescape View File

@ -458,7 +458,7 @@ void MySQL_Connection::connect_start() {
assert(mysql);
mysql_options(mysql, MYSQL_OPT_NONBLOCK, 0);
mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "program_name", "proxysql");
mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "_server_name", parent->address);
mysql_options4(mysql, MYSQL_OPT_CONNECT_ATTR_ADD, "_server_host", parent->address);
if (parent->use_ssl) {
mysql_ssl_set(mysql, mysql_thread___ssl_p2s_key, mysql_thread___ssl_p2s_cert, mysql_thread___ssl_p2s_ca, NULL, mysql_thread___ssl_p2s_cipher);
}

Write Preview
Loading…
Cancel
Save