Rooba
/
drogon
mirror of https://github.com/drogonframework/drogon.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a bug in the MysqlConnection class

This commit is contained in:
antao 2019-02-18 14:26:21 +08:00
parent 1600cb98fe
commit 2370a3f89f
2 changed files with 37 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
orm_lib/src/TransactionImpl.cc
View File

@ -164,25 +164,23 @@ void TransactionImpl::rollback()
return;
}
thisPtr->_isWorking = true;
thisPtr
->_connectionPtr
->execSql("rollback",
0,
std::vector<const char *>(),
std::vector<int>(),
std::vector<int>(),
[](const Result &r) {
LOG_TRACE << "Transaction roll back!";
//clearupCb();
},
[](const std::exception_ptr &ePtr) {
//clearupCb();
LOG_ERROR << "Transaction rool back error";
},
[thisPtr, clearupCb]() {
clearupCb();
thisPtr->execNewTask();
});
thisPtr->_connectionPtr->execSql("rollback",
0,
std::vector<const char *>(),
std::vector<int>(),
std::vector<int>(),
[](const Result &r) {
LOG_TRACE << "Transaction roll back!";
//clearupCb();
},
[](const std::exception_ptr &ePtr) {
//clearupCb();
LOG_ERROR << "Transaction rool back error";
},
[thisPtr, clearupCb]() {
clearupCb();
thisPtr->execNewTask();
});
});
}
@ -197,29 +195,24 @@ void TransactionImpl::execNewTask()
{
auto cmd = _sqlCmdBuffer.front();
_sqlCmdBuffer.pop_front();
auto conn = _connectionPtr;
_loop->queueInLoop([=]() mutable {
conn->execSql(std::move(cmd._sql),
cmd._paraNum,
std::move(cmd._parameters),
std::move(cmd._length),
std::move(cmd._format),
std::move(cmd._cb),
[cmd, thisPtr](const std::exception_ptr &ePtr) {
if (!cmd._idleCb)
thisPtr->rollback();
if (cmd._exceptCb)
cmd._exceptCb(ePtr);
},
[cmd,thisPtr]() {
if(cmd._idleCb)
cmd._idleCb();
thisPtr->execNewTask();
});
});
conn->execSql(std::move(cmd._sql),
cmd._paraNum,
std::move(cmd._parameters),
std::move(cmd._length),
std::move(cmd._format),
std::move(cmd._cb),
[cmd, thisPtr](const std::exception_ptr &ePtr) {
if (!cmd._idleCb)
thisPtr->rollback();
if (cmd._exceptCb)
cmd._exceptCb(ePtr);
},
[cmd, thisPtr]() {
if (cmd._idleCb)
cmd._idleCb();
thisPtr->execNewTask();
});
return;
}
_isWorking = false;

3
orm_lib/src/mysql_impl/MysqlConnection.cc
View File

@ -72,6 +72,7 @@ MysqlConnection::MysqlConnection(trantor::EventLoop *loop, const std::string &co
}
else if (key == "dbname")
{
LOG_DEBUG << "database:" << value;
dbname = value;
}
else if (key == "port")
@ -204,6 +205,8 @@ void MysqlConnection::handleEvent()
if (revents & POLLPRI)
status |= MYSQL_WAIT_EXCEPT;
status = (status & _waitStatus);
if (status == 0)
return;
MYSQL *ret;
if (_status == ConnectStatus_Connecting)
{