Date: Wednesday, November 29, 2006 @ 16:24:12
Author: csaba
Path: /cvsroot/carob/libmysequoia
Modified: include/CarobMySQL.hpp (1.40 -> 1.41) src/CarobMySQL.cpp (1.94
-> 1.95)
Set ping_delay=0 and controller_timeout=0 to use Carob's defaults. Fixes LMS-35
------------------------+
include/CarobMySQL.hpp | 4 ++--
src/CarobMySQL.cpp | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
Index: libmysequoia/include/CarobMySQL.hpp
diff -u libmysequoia/include/CarobMySQL.hpp:1.40
libmysequoia/include/CarobMySQL.hpp:1.41
--- libmysequoia/include/CarobMySQL.hpp:1.40 Tue Nov 28 17:22:56 2006
+++ libmysequoia/include/CarobMySQL.hpp Wed Nov 29 16:24:12 2006
@@ -290,9 +290,9 @@
Converter conv;
// persistent connection
bool usePersistentConnection;
- // ping delay in ms, default is 1000
+ // ping delay in ms, see Carob ConnectionParameters.cpp for the defaults
int ping_delay;
- // controller timeout in ms, default is 3000
+ // controller timeout in ms, see Carob ConnectionParameters.cpp for the
defaults
int controller_timeout;
/**
Index: libmysequoia/src/CarobMySQL.cpp
diff -u libmysequoia/src/CarobMySQL.cpp:1.94
libmysequoia/src/CarobMySQL.cpp:1.95
--- libmysequoia/src/CarobMySQL.cpp:1.94 Wed Nov 29 14:08:26 2006
+++ libmysequoia/src/CarobMySQL.cpp Wed Nov 29 16:24:12 2006
@@ -41,7 +41,7 @@
CarobMYSQL::CarobMYSQL (MYSQL *mysql, my_bool free_me) :
connectionPtr(0), stmtPtr(0), drsPtr(0), liveResultPtr(0),
- usePersistentConnection(false), ping_delay(1000), controller_timeout(3000)
+ usePersistentConnection(false), ping_delay(0), controller_timeout(0)
{
LOG4CXX_DEBUG(logger, "Entering constructor; mysql=" << mysql << " free_me="
<< (bool) free_me);
@@ -1221,6 +1221,10 @@
if (strncmp(ini.get(group, "persistent_connection").c_str(), "true", 4) == 0)
usePersistentConnection = true;
+ string carobLogLevel = ini.get(group, "carob_log_level");
+ if (! carobLogLevel.empty())
+ setLogLevel(atoi(carobLogLevel.c_str()));
+
LOG4CXX_DEBUG(logger, "Leaving read_ini_file.");
}
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
