generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-02-23 23:16:39 +01:00
Code Issues Projects Releases Wiki Activity

POCO SQLite Data Connector hangs #2108

Browse Source
This commit is contained in:
Alex Fabijanic 2018-02-09 08:29:26 -06:00
parent f1056e4d36
commit d9bff00222
1 changed files with 14 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Data/SQLite/src/SessionImpl.cpp
View File

@ -17,8 +17,7 @@
#include "Poco/Data/SQLite/SQLiteStatementImpl.h" #include "Poco/Data/SQLite/SQLiteStatementImpl.h"
#include "Poco/Data/SQLite/SQLiteException.h" #include "Poco/Data/SQLite/SQLiteException.h"
#include "Poco/Data/Session.h" #include "Poco/Data/Session.h"
#include "Poco/ActiveMethod.h" #include "Poco/Stopwatch.h"
#include "Poco/ActiveResult.h"
#include "Poco/String.h" #include "Poco/String.h"
#include "Poco/Mutex.h" #include "Poco/Mutex.h"
#include "Poco/Data/DataException.h" #include "Poco/Data/DataException.h"
@ -139,32 +138,6 @@ bool SessionImpl::isTransactionIsolation(Poco::UInt32 ti)
} }
class ActiveConnector
{
public:
ActiveConnector(const std::string& connectString, sqlite3** ppDB):
connect(this, &ActiveConnector::connectImpl),
_connectString(connectString),
_ppDB(ppDB)
{
poco_check_ptr(_ppDB);
}
ActiveMethod<int, void, ActiveConnector> connect;
private:
ActiveConnector();
inline int connectImpl()
{
return sqlite3_open_v2(_connectString.c_str(), _ppDB, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_URI, NULL);
}
std::string _connectString;
sqlite3** _ppDB;
};
void SessionImpl::open(const std::string& connect) void SessionImpl::open(const std::string& connect)
{ {
if (connect != connectionString()) if (connect != connectionString())
@ -180,16 +153,20 @@ void SessionImpl::open(const std::string& connect)
try try
{ {
ActiveConnector connector(connectionString(), &_pDB); int rc = 0;
ActiveResult<int> result = connector.connect(); size_t tout = getLoginTimeout();
if (!result.tryWait(static_cast<long>(getLoginTimeout() * 1000))) Stopwatch sw; sw.start();
throw ConnectionFailedException("Timed out."); while (true)
int rc = result.data();
if (rc != 0)
{ {
close(); rc = sqlite3_open_v2(connectionString().c_str(), &_pDB,
Utility::throwException(_pDB, rc); SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_URI, NULL);
if (rc == SQLITE_OK) break;
if (sw.elapsedSeconds() >= tout)
{
close();
Utility::throwException(_pDB, rc);
}
else Thread::sleep(10);
} }
} }
catch (SQLiteException& ex) catch (SQLiteException& ex)