summaryrefslogtreecommitdiff
path: root/src/buildtool/file_system/git_cas.cpp
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2024-12-11 13:00:30 +0100
committerKlaus Aehlig <klaus.aehlig@huawei.com>2024-12-11 14:29:33 +0100
commit877c810528a05015f59caebc2f9999dbed670f15 (patch)
treeb4fd118703680d1bcce5f87f889604e1ee750bfe /src/buildtool/file_system/git_cas.cpp
parentbb3d8e8e4451211331afa81cc7754a9d65c12e3e (diff)
downloadjustbuild-877c810528a05015f59caebc2f9999dbed670f15.tar.gz
GitCAS::Open: allow specifying the log-level for failure
This method returns a GitCASPtr allowing the caller to handle failure gracefully. Therefore, logging should be at most at level Warning as it is up to the caller to provide the fatal error message. Moreover, it can be at lower level in cases where failure to open that git cas is not an unexpected event, e.g., when looking for a blob in local mirrors first.
Diffstat (limited to 'src/buildtool/file_system/git_cas.cpp')
-rw-r--r--src/buildtool/file_system/git_cas.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/buildtool/file_system/git_cas.cpp b/src/buildtool/file_system/git_cas.cpp
index 7e004934..295b5783 100644
--- a/src/buildtool/file_system/git_cas.cpp
+++ b/src/buildtool/file_system/git_cas.cpp
@@ -18,7 +18,6 @@
#include <mutex>
#include "src/buildtool/file_system/git_context.hpp"
-#include "src/buildtool/logging/log_level.hpp"
#include "src/buildtool/logging/logger.hpp"
#include "src/utils/cpp/hex_string.hpp"
#include "src/utils/cpp/path.hpp"
@@ -54,8 +53,8 @@ GitCAS::GitCAS() noexcept {
GitContext::Create();
}
-auto GitCAS::Open(std::filesystem::path const& repo_path) noexcept
- -> GitCASPtr {
+auto GitCAS::Open(std::filesystem::path const& repo_path,
+ LogLevel log_failure) noexcept -> GitCASPtr {
#ifdef BOOTSTRAP_BUILD_TOOL
return nullptr;
#else
@@ -70,7 +69,7 @@ auto GitCAS::Open(std::filesystem::path const& repo_path) noexcept
GIT_REPOSITORY_OPEN_NO_SEARCH,
nullptr) != 0 or
repo_ptr == nullptr) {
- Logger::Log(LogLevel::Error,
+ Logger::Log(log_failure,
"Opening git repository {} failed with:\n{}",
repo_path.string(),
GitLastError());
@@ -81,7 +80,7 @@ auto GitCAS::Open(std::filesystem::path const& repo_path) noexcept
git_odb* odb_ptr = nullptr;
if (git_repository_odb(&odb_ptr, result->repo_.get()) != 0 or
odb_ptr == nullptr) {
- Logger::Log(LogLevel::Error,
+ Logger::Log(log_failure,
"Obtaining git object database {} failed with:\n{}",
repo_path.string(),
GitLastError());
@@ -97,7 +96,7 @@ auto GitCAS::Open(std::filesystem::path const& repo_path) noexcept
try {
result->git_path_ = std::filesystem::absolute(git_path);
} catch (std::exception const& e) {
- Logger::Log(LogLevel::Error,
+ Logger::Log(log_failure,
"Failed to obtain absolute path for {}: {}",
git_path.string(),
e.what());