JDierkse/MySQL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Auto Reconnect

Browse Source
This commit is contained in:
JDierkse
2020-04-08 12:41:10 +02:00
parent 2365589910
commit a45717eaf6
4 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MySQL/MySQLClient.cpp
+6 -6
View File
@@ -13,14 +13,14 @@ MySQLClient::~MySQLClient()
{
}
void MySQLClient::Connect(const std::string& hostname, const std::string& username, const std::string& password)
void MySQLClient::Connect(const std::string& hostname, const std::string& username, const std::string& password, bool automaticReconnect)
{
m_pMySQLClientImpl->Connect(hostname, username, password);
m_pMySQLClientImpl->Connect(hostname, username, password, automaticReconnect);
}
void MySQLClient::Connect(const std::string& hostname, const std::string& username, const std::string& password, const std::string& database)
void MySQLClient::Connect(const std::string& hostname, const std::string& username, const std::string& password, const std::string& database, bool automaticReconnect)
{
m_pMySQLClientImpl->Connect(hostname, username, password, database);
m_pMySQLClientImpl->Connect(hostname, username, password, database, automaticReconnect);
}
void MySQLClient::Disconnect()
@@ -28,9 +28,9 @@ void MySQLClient::Disconnect()
m_pMySQLClientImpl->Disconnect();
}
void MySQLClient::Reconnect()
void MySQLClient::Reconnect(bool automaticReconnect)
{
m_pMySQLClientImpl->Reconnect();
m_pMySQLClientImpl->Reconnect(automaticReconnect);
}
bool MySQLClient::Connected()
MySQL/MySQLClientImpl.cpp
+21 -13
View File
@@ -16,24 +16,24 @@ MySQLClientImpl::~MySQLClientImpl()
{
}
void MySQLClientImpl::Connect(const std::string& hostname, const std::string& username, const std::string& password)
void MySQLClientImpl::Connect(const std::string& hostname, const std::string& username, const std::string& password, bool automaticReconnect)
{
std::unique_lock<std::mutex> lock(m_mutex);
m_hostname = hostname;
m_username = username;
m_password = password;
m_database = "";
InternalConnect();
InternalConnect(automaticReconnect);
}
void MySQLClientImpl::Connect(const std::string& hostname, const std::string& username, const std::string& password, const std::string& database)
void MySQLClientImpl::Connect(const std::string& hostname, const std::string& username, const std::string& password, const std::string& database, bool automaticReconnect)
{
std::unique_lock<std::mutex> lock(m_mutex);
m_hostname = hostname;
m_username = username;
m_password = password;
m_database = database;
InternalConnect();
InternalConnect(automaticReconnect);
}
void MySQLClientImpl::Disconnect()
@@ -42,11 +42,11 @@ void MySQLClientImpl::Disconnect()
InternalDisconnect();
}
void MySQLClientImpl::Reconnect()
void MySQLClientImpl::Reconnect(bool automaticReconnect)
{
std::unique_lock<std::mutex> lock(m_mutex);
InternalDisconnect();
InternalConnect();
InternalConnect(automaticReconnect);
}
bool MySQLClientImpl::Connected() const
@@ -117,20 +117,28 @@ std::shared_ptr<MySQLResultSetImpl> MySQLClientImpl::ExecuteQuery(const std::str
return std::make_shared<MySQLResultSetImpl>(nullptr);
}
void MySQLClientImpl::InternalConnect()
void MySQLClientImpl::InternalConnect(bool automaticReconnect)
{
try
{
if (m_pConnection)
Disconnect();
std::stringstream ss;
ss << "tcp://" << m_hostname << ":3306";
InternalDisconnect();
std::string database;
if (!m_database.empty())
ss << "/" << m_database;
database = m_database;
else
database = "information_schema";
m_pConnection = std::shared_ptr<sql::Connection>(m_pDriver->connect(ss.str(), m_username, m_password));
sql::ConnectOptionsMap options;
options["hostName"] = m_hostname;
options["userName"] = m_username;
options["password"] = m_password;
options["schema"] = database;
options["port"] = 3306;
options["OPT_RECONNECT"] = automaticReconnect;
m_pConnection = std::shared_ptr<sql::Connection>(m_pDriver->connect(options));
m_connected = true;
}
catch (sql::SQLException &e)
MySQL/MySQLClientImpl.h
+4 -4
View File
@@ -20,11 +20,11 @@ public:
MySQLClientImpl();
~MySQLClientImpl();
void Connect(const std::string& hostname, const std::string& username, const std::string& password);
void Connect(const std::string& hostname, const std::string& username, const std::string& password, const std::string& database);
void Connect(const std::string& hostname, const std::string& username, const std::string& password, bool automaticReconnect);
void Connect(const std::string& hostname, const std::string& username, const std::string& password, const std::string& database, bool automaticReconnect);
void Disconnect();
void Reconnect();
void Reconnect(bool automaticReconnect);
bool Connected() const;
std::string Database() const;
@@ -33,7 +33,7 @@ public:
std::shared_ptr<MySQLResultSetImpl> ExecuteQuery(const std::string& query);
private:
void InternalConnect();
void InternalConnect(bool automaticReconnect);
void InternalDisconnect();
private:
include/MySQLClient.h
+3 -3
View File
@@ -16,11 +16,11 @@ public:
MySQLClient();
~MySQLClient();
void Connect(const std::string& hostname, const std::string& username, const std::string& password);
void Connect(const std::string& hostname, const std::string& username, const std::string& password, const std::string& database);
void Connect(const std::string& hostname, const std::string& username, const std::string& password, bool automaticReconnect = true);
void Connect(const std::string& hostname, const std::string& username, const std::string& password, const std::string& database, bool automaticReconnect = true);
void Disconnect();
void Reconnect();
void Reconnect(bool automaticReconnect = true);
bool Connected();
std::string Database() const;