From 245bc5d547864f19fe253263cc923b2082ab916e Mon Sep 17 00:00:00 2001 From: Philip Wilk Date: Mon, 2 Jun 2025 02:57:52 +0100 Subject: [PATCH] silence logs because it gets overwhelming --- src/libstore/build/substitution-goal.cc | 7 ++----- src/libstore/store-api.cc | 8 +++++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/libstore/build/substitution-goal.cc b/src/libstore/build/substitution-goal.cc index 59afc12cd..bd8d200fb 100644 --- a/src/libstore/build/substitution-goal.cc +++ b/src/libstore/build/substitution-goal.cc @@ -60,10 +60,6 @@ Goal::Co PathSubstitutionGoal::init() for (const auto & sub : subs) { trace("trying next substituter"); - // If sub is not first, previous one must have failed, so warn - if (&sub != &subs.front()) { - warn("trying next substituter, '%s'", sub->getUri()); - } cleanup(); @@ -88,15 +84,16 @@ Goal::Co PathSubstitutionGoal::init() try { // FIXME: make async info = sub->queryPathInfo(path); - // Because the path doesn't exist } catch (InvalidPath &) { continue; // Because the substituter has failed recently } catch (SubstituterDisabled & e) { + /* This is also VERY spammy warn( "Substituter '%s' was disabled when getting info for path '%s'", sub->getUri(), sub->printStorePath(path)); + */ continue; // Any other error } catch (Error & e) { diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc index 4aaffdbd6..08fd02489 100644 --- a/src/libstore/store-api.cc +++ b/src/libstore/store-api.cc @@ -559,15 +559,17 @@ void Store::querySubstitutablePathInfos(const StorePathCAMap & paths, Substituta } catch (SubstituterDisabled &) { } catch (Error & e) { // if last substituter, THEN log error and throw, otherwise warn - if (&sub == &substituters.back() && settings.tryFallback) { + if (&sub == &substituters.back() && !settings.tryFallback) { logError(e.info()); throw; } else { - warn( - "Unable to download '%s' from subsituter '%s'\n%s", + /* This gets VERY spammy + warn( "Unable to download '%s' from subsituter '%s'\n%s", sub->printStorePath(subPath), sub->getUri(), e.message()); + */ + continue; } } }