wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-24 22:11:15 +02:00
Code Activity

silence logs because it gets overwhelming

Browse source
This commit is contained in:
Philip Wilk 2025-06-02 02:57:52 +01:00
parent 29f9facf76
commit 245bc5d547
No known key found for this signature in database
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/build/substitution-goal.cc
View file

@ -60,10 +60,6 @@ Goal::Co PathSubstitutionGoal::init()
for (const auto & sub : subs) { for (const auto & sub : subs) {
trace("trying next substituter"); 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(); cleanup();
@ -88,15 +84,16 @@ Goal::Co PathSubstitutionGoal::init()
try { try {
// FIXME: make async // FIXME: make async
info = sub->queryPathInfo(path); info = sub->queryPathInfo(path);
// Because the path doesn't exist
} catch (InvalidPath &) { } catch (InvalidPath &) {
continue; continue;
// Because the substituter has failed recently // Because the substituter has failed recently
} catch (SubstituterDisabled & e) { } catch (SubstituterDisabled & e) {
/* This is also VERY spammy
warn( warn(
"Substituter '%s' was disabled when getting info for path '%s'", "Substituter '%s' was disabled when getting info for path '%s'",
sub->getUri(), sub->getUri(),
sub->printStorePath(path)); sub->printStorePath(path));
*/
continue; continue;
// Any other error // Any other error
} catch (Error & e) { } catch (Error & e) {

8
src/libstore/store-api.cc
View file

@ -559,15 +559,17 @@ void Store::querySubstitutablePathInfos(const StorePathCAMap & paths, Substituta
} catch (SubstituterDisabled &) { } catch (SubstituterDisabled &) {
} catch (Error & e) { } catch (Error & e) {
// if last substituter, THEN log error and throw, otherwise warn // 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()); logError(e.info());
throw; throw;
} else { } else {
warn( /* This gets VERY spammy
"Unable to download '%s' from subsituter '%s'\n%s", warn( "Unable to download '%s' from subsituter '%s'\n%s",
sub->printStorePath(subPath), sub->printStorePath(subPath),
sub->getUri(), sub->getUri(),
e.message()); e.message());
*/
continue;
} }
} }
} }