Date: Monday, October 9, 2006 @ 16:34:17
Author: csaba
Path: /cvsroot/carob/libmysequoia
Modified: config/mysequoia.conf (1.7 -> 1.8) include/CarobMySQL.hpp (1.37
-> 1.38) src/CarobMySQL.cpp (1.83 -> 1.84)
Make the socket timeout configurable in the mysequoia.conf file. Fixes for
LMS-25
------------------------+
config/mysequoia.conf | 1 +
include/CarobMySQL.hpp | 2 ++
src/CarobMySQL.cpp | 11 +++++++----
3 files changed, 10 insertions(+), 4 deletions(-)
Index: libmysequoia/config/mysequoia.conf
diff -u libmysequoia/config/mysequoia.conf:1.7
libmysequoia/config/mysequoia.conf:1.8
--- libmysequoia/config/mysequoia.conf:1.7 Thu Oct 5 09:55:50 2006
+++ libmysequoia/config/mysequoia.conf Mon Oct 9 16:34:17 2006
@@ -7,3 +7,4 @@
;host = node1 node2
;database = DB1
;persistent_connection = false
+;socket_timeout = 0
Index: libmysequoia/include/CarobMySQL.hpp
diff -u libmysequoia/include/CarobMySQL.hpp:1.37
libmysequoia/include/CarobMySQL.hpp:1.38
--- libmysequoia/include/CarobMySQL.hpp:1.37 Thu Oct 5 09:55:50 2006
+++ libmysequoia/include/CarobMySQL.hpp Mon Oct 9 16:34:17 2006
@@ -290,6 +290,8 @@
Converter conv;
// persistent connection
bool usePersistentConnection;
+ // socket timeout
+ long socketTimeout;
/**
* Private default constructor.
Index: libmysequoia/src/CarobMySQL.cpp
diff -u libmysequoia/src/CarobMySQL.cpp:1.83
libmysequoia/src/CarobMySQL.cpp:1.84
--- libmysequoia/src/CarobMySQL.cpp:1.83 Thu Oct 5 09:55:50 2006
+++ libmysequoia/src/CarobMySQL.cpp Mon Oct 9 16:34:17 2006
@@ -40,7 +40,7 @@
using namespace std;
CarobMYSQL::CarobMYSQL (MYSQL *mysql, my_bool free_me) :
- connectionPtr(0), stmtPtr(0), drsPtr(0), liveResultPtr(0),
usePersistentConnection(true)
+ connectionPtr(0), stmtPtr(0), drsPtr(0), liveResultPtr(0),
usePersistentConnection(true), socketTimeout(0)
{
LOG4CXX_DEBUG(logger, "Entering constructor; mysql=" << mysql << " free_me="
<< (bool) free_me);
static char version[6];
@@ -201,7 +201,7 @@
}
// 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(), usePersistentConnection,
usePersistentConnection?true:false, socketTimeout);
Connection *newConnectionPtr = new Connection(connectionParameters);
@@ -211,7 +211,7 @@
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 << " socket timeout=" <<
socketTimeout);
reset_error();
@@ -1180,7 +1180,10 @@
/* set persistent connection */
if (strncmp(ini.get(group, "persistent_connection").c_str(), "false", 5) ==
0)
usePersistentConnection = false;
-
+
+ /* set socket timeout */
+ socketTimeout = atol(ini.get(group, "socket_timeout").c_str());
+
LOG4CXX_DEBUG(logger, "Leaving read_ini_file.");
}
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
