Date: Tuesday, November 28, 2006 @ 17:22:56
Author: csaba
Path: /cvsroot/carob/libmysequoia
Modified: config/mysequoia.conf (1.11 -> 1.12) include/CarobMySQL.hpp
(1.39 -> 1.40) src/CarobMySQL.cpp (1.91 -> 1.92)
test/Globals.hpp (1.5 -> 1.6)
Added ping_delay and controller_timeout. Fixes for LMS-35
------------------------+
config/mysequoia.conf | 6 ++++++
include/CarobMySQL.hpp | 4 ++++
src/CarobMySQL.cpp | 18 ++++++++++++++----
test/Globals.hpp | 8 ++++----
4 files changed, 28 insertions(+), 8 deletions(-)
Index: libmysequoia/config/mysequoia.conf
diff -u libmysequoia/config/mysequoia.conf:1.11
libmysequoia/config/mysequoia.conf:1.12
--- libmysequoia/config/mysequoia.conf:1.11 Fri Nov 24 15:04:08 2006
+++ libmysequoia/config/mysequoia.conf Tue Nov 28 17:22:56 2006
@@ -25,6 +25,12 @@
;database = DB1
;default-character-set=latin1
+# the default ping delay in milliseconds
+;ping_delay = 1000
+
+# the default controller timeout in milliseconds
+;controller_timeout = 3000
+
# persistent connection by default are off
# this means that mysql_warning() and
# mysql_insert_id() will not work
Index: libmysequoia/include/CarobMySQL.hpp
diff -u libmysequoia/include/CarobMySQL.hpp:1.39
libmysequoia/include/CarobMySQL.hpp:1.40
--- libmysequoia/include/CarobMySQL.hpp:1.39 Tue Oct 10 11:14:27 2006
+++ libmysequoia/include/CarobMySQL.hpp Tue Nov 28 17:22:56 2006
@@ -290,6 +290,10 @@
Converter conv;
// persistent connection
bool usePersistentConnection;
+ // ping delay in ms, default is 1000
+ int ping_delay;
+ // controller timeout in ms, default is 3000
+ int controller_timeout;
/**
* Private default constructor.
Index: libmysequoia/src/CarobMySQL.cpp
diff -u libmysequoia/src/CarobMySQL.cpp:1.91
libmysequoia/src/CarobMySQL.cpp:1.92
--- libmysequoia/src/CarobMySQL.cpp:1.91 Fri Nov 24 15:04:08 2006
+++ libmysequoia/src/CarobMySQL.cpp Tue Nov 28 17:22:56 2006
@@ -40,7 +40,9 @@
using namespace std;
CarobMYSQL::CarobMYSQL (MYSQL *mysql, my_bool free_me) :
- connectionPtr(0), stmtPtr(0), drsPtr(0), liveResultPtr(0),
usePersistentConnection(false)
+ connectionPtr(0), stmtPtr(0), drsPtr(0), liveResultPtr(0),
+ usePersistentConnection(false), ping_delay(1000), controller_timeout(3000)
+
{
LOG4CXX_DEBUG(logger, "Entering constructor; mysql=" << mysql << " free_me="
<< (bool) free_me);
static char version[6];
@@ -201,7 +203,8 @@
}
// we can retrieve the warnings only if we have persistent connection
- ConnectionParameters connectionParameters(ctrls, to_wstring(db),
to_wstring(user), to_wstring(passwd), ht.getPolicy(), usePersistentConnection,
usePersistentConnection?true:false);
+ ConnectionParameters connectionParameters(ctrls, to_wstring(db),
to_wstring(user), to_wstring(passwd), ht.getPolicy(),
+ ping_delay,
controller_timeout, usePersistentConnection,
usePersistentConnection?true:false);
Connection *newConnectionPtr = new Connection(connectionParameters);
@@ -211,7 +214,9 @@
delete_connection();
set_connect_info(host, user, passwd, db, port);
- LOG4CXX_INFO(logger, "Connected: host=" << host << " user=" << user <<
" passwd=" << passwd << " db=" << db << " port=" << port << "
persistent_connection=" << usePersistentConnection);
+ LOG4CXX_INFO(logger, "Connected: host=" << host << " user=" << user <<
" passwd=" << passwd << " db=" << db <<
+ " port=" << port << "
persistent_connection=" << usePersistentConnection <<
+ " ping_delay=" << ping_delay
<< " controller_timeout=" << controller_timeout);
reset_error();
@@ -1147,10 +1152,11 @@
{
LOG4CXX_DEBUG(logger, "Entering read_ini_file.");
- char *group;
+ char *group = 0;
char *home_dir = getenv("HOME");
char *conf_dir = getenv("LIBMYSEQUOIA_CONF_DIR");
IniParser ini;
+ int val = 0;
/*
* The order of reading the config files:
@@ -1199,6 +1205,10 @@
cstrdupcond(mysqlPtr->options.password, ini.get(group, "password").c_str());
cstrdupcond(mysqlPtr->options.db, ini.get(group, "database").c_str());
mysqlPtr->options.port = atoi(ini.get(group, "port").c_str());
+ if ((val = atoi(ini.get(group, "ping_delay").c_str())) > 0)
+ ping_delay = val;
+ if ((val = atoi(ini.get(group, "controller_timeout").c_str())) > 0)
+ controller_timeout = val;
if (!mysqlPtr->options.charset_name || !*mysqlPtr->options.charset_name)
cstrdupcond(mysqlPtr->options.charset_name, ini.get(group,
"default-character-set").c_str());
if (!mysqlPtr->options.charset_dir || !*mysqlPtr->options.charset_dir)
Index: libmysequoia/test/Globals.hpp
diff -u libmysequoia/test/Globals.hpp:1.5 libmysequoia/test/Globals.hpp:1.6
--- libmysequoia/test/Globals.hpp:1.5 Wed Aug 30 15:14:47 2006
+++ libmysequoia/test/Globals.hpp Tue Nov 28 17:22:56 2006
@@ -22,10 +22,10 @@
#ifndef _GLOBALS_HPP
#define _GLOBALS_HPP
-const char *USER1 = "realuser";
-const char *PASSWD1 = "realpass";
-const char *USER2 = "cts1";
-const char *PASSWD2 = "cts1";
+const char *USER1 = "user";
+const char *PASSWD1 = "pass";
+const char *USER2 = "user2";
+const char *PASSWD2 = "pass2";
const char *BAD_USER = "nonexistent_user_name";
const char *BAD_PASSWD = "bad_password";
const char *HOST = "n1 n2";
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
