diff --git a/services/lib/src/server-base-reactors/ServerBidiReactorBase.h b/services/lib/src/server-base-reactors/ServerBidiReactorBase.h --- a/services/lib/src/server-base-reactors/ServerBidiReactorBase.h +++ b/services/lib/src/server-base-reactors/ServerBidiReactorBase.h @@ -1,12 +1,14 @@ #pragma once #include "BaseReactor.h" +#include "Worker.h" #include #include #include #include +#include namespace comm { namespace network { @@ -95,23 +97,27 @@ void ServerBidiReactorBase::terminate( ServerBidiReactorStatus status) { this->setStatus(status); - try { - this->terminateCallback(); - this->validate(); - } catch (std::exception &e) { - this->setStatus(ServerBidiReactorStatus( - grpc::Status(grpc::StatusCode::INTERNAL, e.what()))); - } - if (this->statusHolder->state != ReactorState::RUNNING) { - return; - } - if (this->getStatus().sendLastResponse) { - this->StartWriteAndFinish( - &this->response, grpc::WriteOptions(), this->getStatus().status); - } else { - this->Finish(this->getStatus().status); - } - this->statusHolder->state = ReactorState::TERMINATED; + Worker::getInstance().schedule( + [this]() { + this->terminateCallback(); + this->validate(); + }, + [this](std::unique_ptr err) { + if (err != nullptr) { + this->setStatus(ServerBidiReactorStatus( + grpc::Status(grpc::StatusCode::INTERNAL, std::string(*err)))); + } + if (this->statusHolder->state != ReactorState::RUNNING) { + return; + } + if (this->getStatus().sendLastResponse) { + this->StartWriteAndFinish( + &this->response, grpc::WriteOptions(), this->getStatus().status); + } else { + this->Finish(this->getStatus().status); + } + this->statusHolder->state = ReactorState::TERMINATED; + }); } template @@ -136,19 +142,23 @@ this->terminate(ServerBidiReactorStatus(grpc::Status::OK)); return; } - try { - this->response = Response(); - std::unique_ptr status = - this->handleRequest(this->request, &this->response); - if (status != nullptr) { - this->terminate(*status); - return; - } - this->StartWrite(&this->response); - } catch (std::exception &e) { - this->terminate(ServerBidiReactorStatus( - grpc::Status(grpc::StatusCode::INTERNAL, e.what()))); - } + Worker::getInstance().schedule( + [this]() { + this->response = Response(); + std::unique_ptr status = + this->handleRequest(this->request, &this->response); + if (status != nullptr) { + this->terminate(*status); + return; + } + this->StartWrite(&this->response); + }, + [this](std::unique_ptr err) { + if (err != nullptr) { + this->terminate(ServerBidiReactorStatus( + grpc::Status(grpc::StatusCode::INTERNAL, *err))); + } + }); } template