From 702187ec4158b7e6a21e7fb6b0d2f6ef8137dcc9 Mon Sep 17 00:00:00 2001 From: Sascha Roloff Date: Fri, 23 Feb 2024 14:58:49 +0100 Subject: Unify error logging in just execute BatchUpdateBlobs --- src/buildtool/execution_api/execution_service/cas_server.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/buildtool/execution_api/execution_service/cas_server.cpp') diff --git a/src/buildtool/execution_api/execution_service/cas_server.cpp b/src/buildtool/execution_api/execution_service/cas_server.cpp index 4fd78323..1e56eb53 100644 --- a/src/buildtool/execution_api/execution_service/cas_server.cpp +++ b/src/buildtool/execution_api/execution_service/cas_server.cpp @@ -123,8 +123,10 @@ auto CASServiceImpl::BatchUpdateBlobs( // before storing the actual tree object. if (auto err = CASUtils::EnsureTreeInvariant(x.data(), hash, *storage_)) { + auto str = fmt::format("BatchUpdateBlobs: {}", *err); + logger_.Emit(LogLevel::Error, str); return ::grpc::Status{grpc::StatusCode::FAILED_PRECONDITION, - *err}; + str}; } auto const& dgst = storage_->CAS().StoreTree(x.data()); if (!dgst) { @@ -134,7 +136,9 @@ auto CASServiceImpl::BatchUpdateBlobs( return ::grpc::Status{grpc::StatusCode::INTERNAL, str}; } if (auto err = CheckDigestConsistency(x.digest(), *dgst)) { - return ::grpc::Status{grpc::StatusCode::INVALID_ARGUMENT, *err}; + auto str = fmt::format("BatchUpdateBlobs: {}", *err); + logger_.Emit(LogLevel::Error, str); + return ::grpc::Status{grpc::StatusCode::INVALID_ARGUMENT, str}; } } else { @@ -146,7 +150,9 @@ auto CASServiceImpl::BatchUpdateBlobs( return ::grpc::Status{grpc::StatusCode::INTERNAL, str}; } if (auto err = CheckDigestConsistency(x.digest(), *dgst)) { - return ::grpc::Status{grpc::StatusCode::INVALID_ARGUMENT, *err}; + auto str = fmt::format("BatchUpdateBlobs: {}", *err); + logger_.Emit(LogLevel::Error, str); + return ::grpc::Status{grpc::StatusCode::INVALID_ARGUMENT, str}; } } } -- cgit v1.2.3