Skip to content

Added handleFatalError in handleClosed #2291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
an-tao merged 3 commits into from
Apr 21, 2025
Merged

Added handleFatalError in handleClosed #2291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
090ed9b
Added handleFatalError in handleClosed
Demilivor Apr 15, 2025
6a249ad
Minor corrections
Demilivor Apr 15, 2025
85500b5
spelling fix
Demilivor Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion orm_lib/src/DbConnection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class DbConnection : public trantor::NonCopyable

virtual ~DbConnection()
{
LOG_TRACE << "Destruct DbConn" << this;
LOG_TRACE << "Destruct DbConn " << this;
}

ConnectStatus status() const
Expand Down
16 changes: 14 additions & 2 deletions orm_lib/src/postgresql_impl/PgConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,15 @@ void PgConnection::handleClosed()
if (status_ == ConnectStatus::Bad)
return;
status_ = ConnectStatus::Bad;

if (isWorking_)
{
// Connection was closed unexpectedly while isWorking_ was true.
isWorking_ = false;
handleFatalError();
callback_ = nullptr;
}

channel_.disableAll();
channel_.remove();
assert(closeCallback_);
Expand Down Expand Up @@ -406,10 +415,13 @@ void PgConnection::doAfterPreparing()

void PgConnection::handleFatalError()
{
auto exceptPtr =
std::make_exception_ptr(Failure(PQerrorMessage(connectionPtr_.get())));
if (exceptionCallback_)
{
auto exceptPtr = std::make_exception_ptr(
Failure(PQerrorMessage(connectionPtr_.get())));
exceptionCallback_(exceptPtr);
}

exceptionCallback_ = nullptr;
}

Expand Down
Loading