From 726a1988223069437f19b84df509c8812945adac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Mon, 9 Nov 2015 08:16:13 +0000 Subject: [PATCH] Improving variables name (#420) Renamed ping_interval_server to ping_interval_server_msec --- include/MySQL_Thread.h | 2 +- include/proxysql_structs.h | 4 ++-- lib/MySQL_Thread.cpp | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/MySQL_Thread.h b/include/MySQL_Thread.h index 30731561c..b4bad6c18 100644 --- a/include/MySQL_Thread.h +++ b/include/MySQL_Thread.h @@ -261,7 +261,7 @@ class MySQL_Threads_Handler char *monitor_username; char *monitor_password; bool monitor_timer_cached; - int ping_interval_server; + int ping_interval_server_msec; int ping_timeout_server; int shun_on_failures; int shun_recovery_time_sec; diff --git a/include/proxysql_structs.h b/include/proxysql_structs.h index dbed70b69..c6dec765d 100644 --- a/include/proxysql_structs.h +++ b/include/proxysql_structs.h @@ -680,7 +680,7 @@ __thread int mysql_thread___default_query_delay; __thread int mysql_thread___default_query_timeout; __thread int mysql_thread___long_query_time; __thread int mysql_thread___free_connections_pct; -__thread int mysql_thread___ping_interval_server; +__thread int mysql_thread___ping_interval_server_msec; __thread int mysql_thread___ping_timeout_server; __thread int mysql_thread___shun_on_failures; __thread int mysql_thread___shun_recovery_time_sec; @@ -738,7 +738,7 @@ extern __thread int mysql_thread___default_query_delay; extern __thread int mysql_thread___default_query_timeout; extern __thread int mysql_thread___long_query_time; extern __thread int mysql_thread___free_connections_pct; -extern __thread int mysql_thread___ping_interval_server; +extern __thread int mysql_thread___ping_interval_server_msec; extern __thread int mysql_thread___ping_timeout_server; extern __thread int mysql_thread___shun_on_failures; extern __thread int mysql_thread___shun_recovery_time_sec; diff --git a/lib/MySQL_Thread.cpp b/lib/MySQL_Thread.cpp index fc06f2b74..a66ccf873 100644 --- a/lib/MySQL_Thread.cpp +++ b/lib/MySQL_Thread.cpp @@ -169,7 +169,7 @@ static char * mysql_thread_variables_names[]= { (char *)"default_query_delay", (char *)"default_query_timeout", (char *)"long_query_time", - (char *)"ping_interval_server", + (char *)"ping_interval_server_msec", (char *)"ping_timeout_server", (char *)"default_schema", (char *)"poll_timeout", @@ -236,7 +236,7 @@ MySQL_Threads_Handler::MySQL_Threads_Handler() { variables.default_query_delay=0; variables.default_query_timeout=24*3600*1000; variables.long_query_time=1000; - variables.ping_interval_server=10000; + variables.ping_interval_server_msec=10000; variables.ping_timeout_server=200; variables.default_schema=strdup((char *)"information_schema"); variables.default_charset=33; @@ -387,7 +387,7 @@ int MySQL_Threads_Handler::get_variable_int(char *name) { if (!strcasecmp(name,"default_query_timeout")) return (int)variables.default_query_timeout; if (!strcasecmp(name,"long_query_time")) return (int)variables.long_query_time; if (!strcasecmp(name,"free_connections_pct")) return (int)variables.free_connections_pct; - if (!strcasecmp(name,"ping_interval_server")) return (int)variables.ping_interval_server; + if (!strcasecmp(name,"ping_interval_server_msec")) return (int)variables.ping_interval_server_msec; if (!strcasecmp(name,"ping_timeout_server")) return (int)variables.ping_timeout_server; if (!strcasecmp(name,"have_compress")) return (int)variables.have_compress; if (!strcasecmp(name,"commands_stats")) return (int)variables.commands_stats; @@ -538,8 +538,8 @@ char * MySQL_Threads_Handler::get_variable(char *name) { // this is the public f sprintf(intbuf,"%d",variables.long_query_time); return strdup(intbuf); } - if (!strcasecmp(name,"ping_interval_server")) { - sprintf(intbuf,"%d",variables.ping_interval_server); + if (!strcasecmp(name,"ping_interval_server_msec")) { + sprintf(intbuf,"%d",variables.ping_interval_server_msec); return strdup(intbuf); } if (!strcasecmp(name,"ping_timeout_server")) { @@ -843,10 +843,10 @@ bool MySQL_Threads_Handler::set_variable(char *name, char *value) { // this is t return false; } } - if (!strcasecmp(name,"ping_interval_server")) { + if (!strcasecmp(name,"ping_interval_server_msec")) { int intv=atoi(value); if (intv >= 1000 && intv <= 7*24*3600*1000) { - variables.ping_interval_server=intv; + variables.ping_interval_server_msec=intv; return true; } else { return false; @@ -1323,9 +1323,9 @@ void MySQL_Thread::run() { while (shutdown==0) { int num_idles; - if (processing_idles==false && (last_processing_idles < curtime-mysql_thread___ping_interval_server*1000/10) ) { + if (processing_idles==false && (last_processing_idles < curtime-mysql_thread___ping_interval_server_msec*1000/10) ) { int i; - num_idles=MyHGM->get_multiple_idle_connections(-1, curtime-mysql_thread___ping_interval_server*1000, my_idle_conns, SESSIONS_FOR_CONNECTIONS_HANDLER); + num_idles=MyHGM->get_multiple_idle_connections(-1, curtime-mysql_thread___ping_interval_server_msec*1000, my_idle_conns, SESSIONS_FOR_CONNECTIONS_HANDLER); for (i=0; iget_variable_int((char *)"default_query_delay"); mysql_thread___default_query_timeout=GloMTH->get_variable_int((char *)"default_query_timeout"); mysql_thread___long_query_time=GloMTH->get_variable_int((char *)"long_query_time"); - mysql_thread___ping_interval_server=GloMTH->get_variable_int((char *)"ping_interval_server"); + mysql_thread___ping_interval_server_msec=GloMTH->get_variable_int((char *)"ping_interval_server_msec"); mysql_thread___ping_timeout_server=GloMTH->get_variable_int((char *)"ping_timeout_server"); mysql_thread___shun_on_failures=GloMTH->get_variable_int((char *)"shun_on_failures"); mysql_thread___shun_recovery_time_sec=GloMTH->get_variable_int((char *)"shun_recovery_time_sec");