Date: Tuesday, April 4, 2006 @ 18:35:59
Author: gilles
Path: /cvsroot/carob/carob
Modified: contrib/CPP/read_example.cpp (1.4 -> 1.5)
contrib/PHP/sample_carob_request.cpp (1.9 -> 1.10)
include/ConnectionParameters.hpp (1.20 -> 1.21)
src/ConnectionParameters.cpp (1.17 -> 1.18)
test/10-Connection/TestConnect.cpp (1.5 -> 1.6)
test/10-Connection/TestFailOver.cpp (1.1 -> 1.2)
test/ConnectionSetup.cpp (1.6 -> 1.7)
Removed unused debug level in connection parameters.
Fixes CAROB-90
--------------------------------------+
contrib/CPP/read_example.cpp | 3 +--
contrib/PHP/sample_carob_request.cpp | 3 +--
include/ConnectionParameters.hpp | 13 -------------
src/ConnectionParameters.cpp | 2 --
test/10-Connection/TestConnect.cpp | 18 ++++++------------
test/10-Connection/TestFailOver.cpp | 9 +++------
test/ConnectionSetup.cpp | 3 +--
7 files changed, 12 insertions(+), 39 deletions(-)
Index: carob/contrib/CPP/read_example.cpp
diff -u carob/contrib/CPP/read_example.cpp:1.4
carob/contrib/CPP/read_example.cpp:1.5
--- carob/contrib/CPP/read_example.cpp:1.4 Thu Jan 12 17:33:46 2006
+++ carob/contrib/CPP/read_example.cpp Tue Apr 4 18:35:58 2006
@@ -46,8 +46,7 @@
25322,
L"myDB",
L"user",
- L"",
- DEBUG_LEVEL_DEBUG);
+ L"");
try
{
// 1.3 3rd step: connect to controller
Index: carob/contrib/PHP/sample_carob_request.cpp
diff -u carob/contrib/PHP/sample_carob_request.cpp:1.9
carob/contrib/PHP/sample_carob_request.cpp:1.10
--- carob/contrib/PHP/sample_carob_request.cpp:1.9 Wed Dec 28 18:14:57 2005
+++ carob/contrib/PHP/sample_carob_request.cpp Tue Apr 4 18:35:58 2006
@@ -103,8 +103,7 @@
25322,
L"myDB",
L"user",
- L"",
- DEBUG_LEVEL_DEBUG);
+ L"");
try
{
char *req;
Index: carob/include/ConnectionParameters.hpp
diff -u carob/include/ConnectionParameters.hpp:1.20
carob/include/ConnectionParameters.hpp:1.21
--- carob/include/ConnectionParameters.hpp:1.20 Thu Mar 23 17:10:04 2006
+++ carob/include/ConnectionParameters.hpp Tue Apr 4 18:35:58 2006
@@ -29,13 +29,6 @@
#include <vector>
namespace CarobNS {
-enum DebugLevel
-{
- DEBUG_LEVEL_OFF,
- DEBUG_LEVEL_INFO,
- DEBUG_LEVEL_DEBUG
-};
-
enum ConnectPolicy
{
ROUND_ROBIN
@@ -84,7 +77,6 @@
#define DEFAULT_USER L"user"
#define DEFAULT_PASSWD L""
#define DEFAULT_DB L"myDB"
-#define DEFAULT_DEBUG_LEVEL DEBUG_LEVEL_OFF
#define DEFAULT_POLICY ROUND_ROBIN
#define DEFAULT_RETRY_INTERVAL 10
#define DEFAULT_CONNECTION_PERSISTENCY false
@@ -120,7 +112,6 @@
const std::wstring& db = DEFAULT_DB,
const std::wstring& uname = DEFAULT_USER,
const std::wstring& upass = DEFAULT_PASSWD,
- DebugLevel dl =
DEFAULT_DEBUG_LEVEL,
ConnectPolicy cp = DEFAULT_POLICY,
int retryIntervalInMs =
DEFAULT_RETRY_INTERVAL,
bool persistentConnection =
DEFAULT_CONNECTION_PERSISTENCY)
@@ -155,8 +146,6 @@
std::wstring getUserName() const { return user_name; }
/** Gives the user password */
std::wstring getUserPass() const { return user_pass; }
- /** Gives the debug level */
- DebugLevel getDebugLevel() const { return debug_level; }
/** Gives the connection policy */
ConnectPolicy getConnectPolicy() const { return connect_policy; }
/** Gives the retry interval in ms */
@@ -172,8 +161,6 @@
std::wstring user_name;
/** User password for database access */
std::wstring user_pass;
- /** Connection debug level */
- DebugLevel debug_level;
/** Controller connection policy */
ConnectPolicy connect_policy;
/** Time in ms between two connection attempts */
Index: carob/src/ConnectionParameters.cpp
diff -u carob/src/ConnectionParameters.cpp:1.17
carob/src/ConnectionParameters.cpp:1.18
--- carob/src/ConnectionParameters.cpp:1.17 Wed Feb 15 11:03:42 2006
+++ carob/src/ConnectionParameters.cpp Tue Apr 4 18:35:58 2006
@@ -72,7 +72,6 @@
const std::wstring& db /*= DEFAULT_DB*/,
const std::wstring& uname /*= DEFAULT_USER*/,
const std::wstring& upass /*= DEFAULT_PASSWD*/,
- DebugLevel dl /*= DEFAULT_DEBUG_LEVEL*/,
ConnectPolicy cp /*= DEFAULT_POLICY*/,
int retryIntervalInMs /*= DEFAULT_RETRY_INTERVAL*/,
bool persistentConnections /*= DEFAULT_CONNECTION_PERSISTENCY */)
@@ -80,7 +79,6 @@
database_name(checkDatabaseName(db)),
user_name(uname),
user_pass(upass),
- debug_level(dl),
connect_policy(cp),
retry_interval_in_ms(retryIntervalInMs),
persistent_connections(persistentConnections)
Index: carob/test/10-Connection/TestConnect.cpp
diff -u carob/test/10-Connection/TestConnect.cpp:1.5
carob/test/10-Connection/TestConnect.cpp:1.6
--- carob/test/10-Connection/TestConnect.cpp:1.5 Fri Feb 24 12:56:41 2006
+++ carob/test/10-Connection/TestConnect.cpp Tue Apr 4 18:35:58 2006
@@ -47,8 +47,7 @@
25322,
L"myDB",
L"user",
- L"",
- DEBUG_LEVEL_DEBUG);
+ L"");
try
{
if (isInfoEnabled())
@@ -75,8 +74,7 @@
12345,
L"myDB",
L"user",
- L"",
- DEBUG_LEVEL_DEBUG);
+ L"");
try
{
if (isInfoEnabled())
@@ -102,8 +100,7 @@
25322,
L"dummyDB",
L"user",
- L"",
- DEBUG_LEVEL_DEBUG);
+ L"");
try
{
connectionPtr = new Connection(connectionPrms);
@@ -131,8 +128,7 @@
25322,
L"myDB",
L"dummyuser",
- L"",
- DEBUG_LEVEL_DEBUG);
+ L"");
try
{
connectionPtr = new Connection(connectionPrms);
@@ -160,8 +156,7 @@
25322,
L"myDB",
L"user",
- L"dummyPass",
- DEBUG_LEVEL_DEBUG);
+ L"dummyPass");
try
{
connectionPtr = new Connection(connectionPrms);
@@ -189,8 +184,7 @@
25322,
L"myDB",
L"user",
- L"",
- DEBUG_LEVEL_DEBUG);
+ L"");
if (isInfoEnabled())
{
logInfo(fctName, L"Connecting to controller - this should succeed");
Index: carob/test/10-Connection/TestFailOver.cpp
diff -u carob/test/10-Connection/TestFailOver.cpp:1.1
carob/test/10-Connection/TestFailOver.cpp:1.2
--- carob/test/10-Connection/TestFailOver.cpp:1.1 Fri Feb 24 12:58:06 2006
+++ carob/test/10-Connection/TestFailOver.cpp Tue Apr 4 18:35:58 2006
@@ -48,8 +48,7 @@
12345,
L"myDB",
L"user",
- L"",
- DEBUG_LEVEL_DEBUG);
+ L"");
// 1st try with only 1 failing ctrler
try
{
@@ -87,8 +86,7 @@
12348,
L"myDB",
L"user",
- L"",
- DEBUG_LEVEL_DEBUG);
+ L"");
// 2nd controller is down too
connectionPrms.addController(L"localhost", 12349);
// 3rd controller is ok
@@ -107,8 +105,7 @@
25324,
L"myDB",
L"user",
- L"",
- DEBUG_LEVEL_DEBUG);
+ L"");
// this one will work
connectionPrms.addController(L"localhost", 25322);
// this one too
Index: carob/test/ConnectionSetup.cpp
diff -u carob/test/ConnectionSetup.cpp:1.6 carob/test/ConnectionSetup.cpp:1.7
--- carob/test/ConnectionSetup.cpp:1.6 Mon Feb 27 16:47:23 2006
+++ carob/test/ConnectionSetup.cpp Tue Apr 4 18:35:58 2006
@@ -36,8 +36,7 @@
25322,
L"myDB",
L"user",
- L"",
- DEBUG_LEVEL_DEBUG);
+ L"");
connectionPtr = new Connection(connectionPrms);
}
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
