diff --git a/cpp/ppc-framework/protocol/Task.h b/cpp/ppc-framework/protocol/Task.h index a43dd4fb..471ddd2b 100644 --- a/cpp/ppc-framework/protocol/Task.h +++ b/cpp/ppc-framework/protocol/Task.h @@ -63,14 +63,10 @@ class TaskResult virtual void setFileInfo(FileInfo::Ptr _fileInfo) { m_fileInfo = std::move(_fileInfo); } // serialize the taskResult to json - virtual Json::Value serializeToJson() const + virtual Json::Value serializeToJson() { Json::Value response; response["taskID"] = m_taskID; - if (!m_status.empty()) - { - response["status"] = m_status; - } if (m_timeCost) { response["timeCost"] = std::to_string(m_timeCost) + "ms"; @@ -81,15 +77,21 @@ class TaskResult response["fileID"] = m_fileInfo->fileID; response["fileMd5"] = m_fileInfo->fileMd5; } - if (m_error) + if (m_error && m_error->errorCode() != 0) { response["code"] = m_error->errorCode(); response["message"] = m_error->errorMessage(); + setStatus(ppc::protocol::toString(TaskStatus::FAILED)); } else { response["code"] = 0; response["message"] = "success"; + sestStatus(ppc::protocol::toString(TaskStatus::COMPLETED)); + } + if (!m_status.empty()) + { + response["status"] = m_status; } return response; } diff --git a/cpp/wedpr-computing/ppc-psi/src/bs-ecdh-psi/protocol/BsEcdhResult.h b/cpp/wedpr-computing/ppc-psi/src/bs-ecdh-psi/protocol/BsEcdhResult.h index e132f198..204a515a 100644 --- a/cpp/wedpr-computing/ppc-psi/src/bs-ecdh-psi/protocol/BsEcdhResult.h +++ b/cpp/wedpr-computing/ppc-psi/src/bs-ecdh-psi/protocol/BsEcdhResult.h @@ -43,7 +43,7 @@ class BsEcdhResult : public protocol::TaskResult [[nodiscard]] Json::Value const& data() const { return m_data; } // serialize the taskResult to json - [[nodiscard]] Json::Value serializeToJson() const override + [[nodiscard]] Json::Value serializeToJson() override { Json::Value response; if (m_error && error()->errorCode()) diff --git a/cpp/wedpr-computing/ppc-psi/src/cm2020-psi/protocol/CM2020PSIResult.h b/cpp/wedpr-computing/ppc-psi/src/cm2020-psi/protocol/CM2020PSIResult.h index 4d461183..a17934a5 100644 --- a/cpp/wedpr-computing/ppc-psi/src/cm2020-psi/protocol/CM2020PSIResult.h +++ b/cpp/wedpr-computing/ppc-psi/src/cm2020-psi/protocol/CM2020PSIResult.h @@ -44,7 +44,7 @@ class CM2020PSIResult : public protocol::TaskResult } // serialize the taskResult to json - [[nodiscard]] Json::Value serializeToJson() const override + [[nodiscard]] Json::Value serializeToJson() override { Json::Value response; response["taskID"] = taskID(); diff --git a/cpp/wedpr-computing/ppc-psi/src/labeled-psi/protocol/LabeledPSIResult.h b/cpp/wedpr-computing/ppc-psi/src/labeled-psi/protocol/LabeledPSIResult.h index 13dd3bf6..bc0dc1de 100644 --- a/cpp/wedpr-computing/ppc-psi/src/labeled-psi/protocol/LabeledPSIResult.h +++ b/cpp/wedpr-computing/ppc-psi/src/labeled-psi/protocol/LabeledPSIResult.h @@ -47,7 +47,7 @@ class LabeledPSIResult : public protocol::TaskResult const std::vector>& getOutputs() { return m_outputs; } // serialize the taskResult to json - Json::Value serializeToJson() const override + Json::Value serializeToJson() override { Json::Value response; response["taskID"] = taskID(); diff --git a/cpp/wedpr-transport/ppc-rpc/src/Rpc.cpp b/cpp/wedpr-transport/ppc-rpc/src/Rpc.cpp index 5b039131..b6ed99a3 100644 --- a/cpp/wedpr-transport/ppc-rpc/src/Rpc.cpp +++ b/cpp/wedpr-transport/ppc-rpc/src/Rpc.cpp @@ -226,7 +226,7 @@ void Rpc::runTask(Json::Value const& _req, RespFunc _respFunc) _respFunc(result->error(), result->serializeToJson()); return; } - + result->setStatus(toString(TaskStatus::COMPLETED)); _respFunc(_result->error(), _result->serializeToJson()); }); }