BazelMsgFactory: Improve error reporting for creating trees

1 files changed, 12 insertions, 3 deletions

diff --git a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp
index 2f3dbc01..1ca23c34 100644
--- a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp
+++ b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp
@@ -491,11 +491,15 @@ auto BazelMsgFactory::CreateDirectoryDigestFromLocalTree(
 
     auto dir_reader = [&files, &dirs, &root, &store_file, &store_dir](
                           auto name, auto type) {
+        const auto full_name = root / name;
         if (IsTreeObject(type)) {
             // create and store sub directory
             auto digest = CreateDirectoryDigestFromLocalTree(
                 root / name, store_file, store_dir);
             if (not digest) {
+                Logger::Log(LogLevel::Error,
+                            "failed storing tree {}",
+                            full_name.string());
                 return false;
             }
 
@@ -508,7 +512,6 @@ auto BazelMsgFactory::CreateDirectoryDigestFromLocalTree(
 
         // create and store file
         try {
-            const auto full_name = root / name;
             if (auto digest = store_file(full_name, IsExecutableObject(type))) {
                 auto file = CreateFileNode(name.string(), type, {});
                 file.set_allocated_digest(gsl::owner<bazel_re::Digest*>{
@@ -516,6 +519,8 @@ auto BazelMsgFactory::CreateDirectoryDigestFromLocalTree(
                 files.emplace_back(std::move(file));
                 return true;
             }
+            Logger::Log(
+                LogLevel::Error, "failed storing file {}", full_name.string());
         } catch (std::exception const& ex) {
             Logger::Log(
                 LogLevel::Error, "storing file failed with:\n{}", ex.what());
@@ -549,10 +554,11 @@ auto BazelMsgFactory::CreateGitTreeDigestFromLocalTree(
     GitRepo::tree_entries_t entries{};
     auto dir_reader = [&entries, &root, &store_file, &store_tree](auto name,
                                                                   auto type) {
+        const auto full_name = root / name;
         if (IsTreeObject(type)) {
             // create and store sub directory
             if (auto digest = CreateGitTreeDigestFromLocalTree(
-                    root / name, store_file, store_tree)) {
+                    full_name, store_file, store_tree)) {
                 if (auto raw_id = FromHexString(
                         NativeSupport::Unprefix(digest->hash()))) {
                     entries[std::move(*raw_id)].emplace_back(name.string(),
@@ -560,12 +566,13 @@ auto BazelMsgFactory::CreateGitTreeDigestFromLocalTree(
                     return true;
                 }
             }
+            Logger::Log(
+                LogLevel::Error, "failed storing tree {}", full_name.string());
             return false;
         }
 
         // create and store file
         try {
-            const auto full_name = root / name;
             if (auto digest = store_file(full_name, IsExecutableObject(type))) {
                 if (auto raw_id = FromHexString(
                         NativeSupport::Unprefix(digest->hash()))) {
@@ -574,6 +581,8 @@ auto BazelMsgFactory::CreateGitTreeDigestFromLocalTree(
                     return true;
                 }
             }
+            Logger::Log(
+                LogLevel::Error, "failed storing file {}", full_name.string());
         } catch (std::exception const& ex) {
             Logger::Log(
                 LogLevel::Error, "storing file failed with:\n{}", ex.what());