增加调试信息

kbengine · kbengine · commit fc7f78c5ecb9 · 2014-07-17T11:20:19.000+08:00
diff --git a/kbe/src/lib/db_mysql/db_interface_mysql.cpp b/kbe/src/lib/db_mysql/db_interface_mysql.cpp
@@ -149,8 +149,7 @@ hasLostConnection_(false),
 inTransaction_(false),
 lock_(NULL, false),
 characterSet_(characterSet),
-collation_(collation),
-lastquery_()
+collation_(collation)
 {
 	lock_.pdbi(this);
 }
diff --git a/kbe/src/lib/db_mysql/db_interface_mysql.hpp b/kbe/src/lib/db_mysql/db_interface_mysql.hpp
@@ -119,6 +119,7 @@ class DBInterfaceMysql : public DBInterface
 	{
 		if(pMysql_ == NULL)
 			return "pMysql is NULL";
+
 		return mysql_error( pMysql_ ); 
 	}
 
@@ -162,11 +163,6 @@ class DBInterfaceMysql : public DBInterface
 		�����쳣
 	*/
 	bool processException(std::exception & e);
-
-	/**
-		��ȡ���һ�β�ѯ��sql���
-	*/
-	std::string lastquery()const{ return lastquery_; }
 protected:
 	MYSQL* pMysql_;
 
@@ -178,8 +174,6 @@ class DBInterfaceMysql : public DBInterface
 
 	std::string characterSet_;
 	std::string collation_;
-	
-	std::string lastquery_;
 };
 
 
diff --git a/kbe/src/lib/dbmgr_lib/db_interface.hpp b/kbe/src/lib/dbmgr_lib/db_interface.hpp
@@ -43,8 +43,17 @@ class DBInterface
 	};
 
 	friend class DBUtil;
-	DBInterface(){};
-	virtual ~DBInterface(){};
+
+	DBInterface():
+	db_port_(3306),
+	db_numConnections_(1),
+	lastquery_()
+	{
+	};
+
+	virtual ~DBInterface()
+	{
+	};
 
 	/**
 		��黷��
@@ -116,6 +125,11 @@ class DBInterface
 		�����쳣
 	*/
 	virtual bool processException(std::exception & e) = 0;
+
+	/**
+		��ȡ���һ�β�ѯ��sql���
+	*/
+	virtual const std::string& lastquery()const{ return lastquery_; }
 protected:
 	char db_type_[MAX_BUF];									// ���ݿ�����
 	uint32 db_port_;										// ���ݿ�Ķ˿�
@@ -124,6 +138,7 @@ class DBInterface
 	char db_password_[MAX_BUF];								// ���ݿ������
 	char db_name_[MAX_BUF];									// ���ݿ���
 	uint16 db_numConnections_;								// ���ݿ��������
+	std::string lastquery_;									// ���һ�β�ѯ����
 };
 
 /*
diff --git a/kbe/src/server/dbmgr/dbtasks.cpp b/kbe/src/server/dbmgr/dbtasks.cpp
@@ -96,7 +96,7 @@ bool DBTask::process()
 	if (duration > stampsPerSecond())
 	{
 		WARNING_MSG(boost::format("DBTask::process(): took %.2f seconds\nsql:(%s)\n") % 
-			(double(duration)/stampsPerSecondD()) % static_cast<DBInterfaceMysql*>(pdbi_)->lastquery().c_str());
+			(double(duration)/stampsPerSecondD()) % pdbi_->lastquery());
 	}
 
 	return ret;
@@ -670,6 +670,7 @@ bool DBTaskCreateMailAccount::db_thread_process()
 	ACCOUNT_INFOS info;
 	if(accountName_.size() == 0)
 	{
+		ERROR_MSG("DBTaskCreateMailAccount::db_thread_process(): accountName is NULL!\n");
 		return false;
 	}
 
@@ -682,7 +683,7 @@ bool DBTaskCreateMailAccount::db_thread_process()
 	{
 		if(pdbi_->getlasterror() > 0)
 		{
-			WARNING_MSG(boost::format("DBTaskCreateMailAccount::db_thread_process(): queryAccount error: %1%\n") % 
+			WARNING_MSG(boost::format("DBTaskCreateMailAccount::db_thread_process(): queryAccount is error: %1%\n") % 
 				pdbi_->getstrerror());
 		}
 
@@ -707,6 +708,8 @@ bool DBTaskCreateMailAccount::db_thread_process()
 	}
 	catch (...)
 	{
+		WARNING_MSG(boost::format("DBTaskCreateMailAccount::db_thread_process(): logAccount(kbe_accountinfos) is error: %1%\n%2%\n") % 
+			pdbi_->getstrerror() % pdbi_->lastquery());
 	}
 
 	unsigned char md[16];
@@ -730,7 +733,7 @@ bool DBTaskCreateMailAccount::db_thread_process()
 //-------------------------------------------------------------------------------------
 thread::TPTask::TPTaskState DBTaskCreateMailAccount::presentMainThread()
 {
-	DEBUG_MSG(boost::format("Dbmgr::reqCreateMailAccount:%1%.\n") % registerName_.c_str());
+	DEBUG_MSG(boost::format("Dbmgr::reqCreateMailAccount:%1%, success=%2%.\n") % registerName_ % success_);
 
 	Mercury::Bundle* pBundle = Mercury::Bundle::ObjPool().createObject();
 	(*pBundle).newMessage(LoginappInterface::onReqCreateMailAccountResult);

Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,7 @@ hasLostConnection_(false),`
`149`	`149`	`inTransaction_(false),`
`150`	`150`	`lock_(NULL, false),`
`151`	`151`	`characterSet_(characterSet),`
`152`		`-collation_(collation),`
`153`		`-lastquery_()`
	`152`	`+collation_(collation)`
`154`	`153`	`{`
`155`	`154`	`lock_.pdbi(this);`
`156`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ bool DBTask::process()`
`96`	`96`	`if (duration > stampsPerSecond())`
`97`	`97`	`{`
`98`	`98`	`WARNING_MSG(boost::format("DBTask::process(): took %.2f seconds\nsql:(%s)\n") %`
`99`		`- (double(duration)/stampsPerSecondD()) % static_cast<DBInterfaceMysql*>(pdbi_)->lastquery().c_str());`
	`99`	`+ (double(duration)/stampsPerSecondD()) % pdbi_->lastquery());`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`return ret;`
`@@ -670,6 +670,7 @@ bool DBTaskCreateMailAccount::db_thread_process()`
`670`	`670`	`ACCOUNT_INFOS info;`
`671`	`671`	`if(accountName_.size() == 0)`
`672`	`672`	`{`
	`673`	`+ ERROR_MSG("DBTaskCreateMailAccount::db_thread_process(): accountName is NULL!\n");`
`673`	`674`	`return false;`
`674`	`675`	`}`
`675`	`676`
`@@ -682,7 +683,7 @@ bool DBTaskCreateMailAccount::db_thread_process()`
`682`	`683`	`{`
`683`	`684`	`if(pdbi_->getlasterror() > 0)`
`684`	`685`	`{`
`685`		`- WARNING_MSG(boost::format("DBTaskCreateMailAccount::db_thread_process(): queryAccount error: %1%\n") %`
	`686`	`+ WARNING_MSG(boost::format("DBTaskCreateMailAccount::db_thread_process(): queryAccount is error: %1%\n") %`
`686`	`687`	`pdbi_->getstrerror());`
`687`	`688`	`}`
`688`	`689`
`@@ -707,6 +708,8 @@ bool DBTaskCreateMailAccount::db_thread_process()`
`707`	`708`	`}`
`708`	`709`	`catch (...)`
`709`	`710`	`{`
	`711`	`+ WARNING_MSG(boost::format("DBTaskCreateMailAccount::db_thread_process(): logAccount(kbe_accountinfos) is error: %1%\n%2%\n") %`
	`712`	`+ pdbi_->getstrerror() % pdbi_->lastquery());`
`710`	`713`	`}`
`711`	`714`
`712`	`715`	`unsigned char md[16];`
`@@ -730,7 +733,7 @@ bool DBTaskCreateMailAccount::db_thread_process()`
`730`	`733`	`//-------------------------------------------------------------------------------------`
`731`	`734`	`thread::TPTask::TPTaskState DBTaskCreateMailAccount::presentMainThread()`
`732`	`735`	`{`
`733`		`- DEBUG_MSG(boost::format("Dbmgr::reqCreateMailAccount:%1%.\n") % registerName_.c_str());`
	`736`	`+ DEBUG_MSG(boost::format("Dbmgr::reqCreateMailAccount:%1%, success=%2%.\n") % registerName_ % success_);`
`734`	`737`
`735`	`738`	`Mercury::Bundle* pBundle = Mercury::Bundle::ObjPool().createObject();`
`736`	`739`	`(*pBundle).newMessage(LoginappInterface::onReqCreateMailAccountResult);`