aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/libstore/build.cc2
-rw-r--r--src/libstore/gc.cc12
-rw-r--r--src/libstore/local-store.cc18
-rw-r--r--src/libutil/logging.cc6
-rw-r--r--src/libutil/util.cc13
-rw-r--r--src/nix-env/user-env.cc2
-rw-r--r--src/nix/make-content-addressable.cc2
-rw-r--r--src/nix/upgrade-nix.cc2
8 files changed, 25 insertions, 32 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 0359b10ac..961110d58 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -4862,7 +4862,7 @@ void Worker::waitForInput()
if (!waitingForAWhile.empty()) {
useTimeout = true;
if (lastWokenUp == steady_time_point::min())
- printError("waiting for locks or build slots...");
+ printInfo("waiting for locks or build slots...");
if (lastWokenUp == steady_time_point::min() || lastWokenUp > before) lastWokenUp = before;
timeout = std::max(1L,
(long) std::chrono::duration_cast<std::chrono::seconds>(
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index e99423257..e529416b7 100644
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@@ -41,7 +41,7 @@ AutoCloseFD LocalStore::openGCLock(LockType lockType)
throw SysError("opening global GC lock '%1%'", fnGCLock);
if (!lockFile(fdGCLock.get(), lockType, false)) {
- printError("waiting for the big garbage collector lock...");
+ printInfo("waiting for the big garbage collector lock...");
lockFile(fdGCLock.get(), lockType, true);
}
@@ -231,7 +231,7 @@ void LocalStore::findTempRoots(FDs & fds, Roots & tempRoots, bool censor)
only succeed if the owning process has died. In that case
we don't care about its temporary roots. */
if (lockFile(fd->get(), ltWrite, false)) {
- printError("removing stale temporary roots file '%1%'", path);
+ printInfo("removing stale temporary roots file '%1%'", path);
unlink(path.c_str());
writeFull(fd->get(), "d");
continue;
@@ -751,7 +751,7 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
/* Find the roots. Since we've grabbed the GC lock, the set of
permanent roots cannot increase now. */
- printError("finding garbage collector roots...");
+ printInfo("finding garbage collector roots...");
Roots rootMap;
if (!options.ignoreLiveness)
findRootsNoTemp(rootMap, true);
@@ -803,9 +803,9 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
} else if (options.maxFreed > 0) {
if (state.shouldDelete)
- printError("deleting garbage...");
+ printInfo("deleting garbage...");
else
- printError("determining live/dead paths...");
+ printInfo("determining live/dead paths...");
try {
@@ -872,7 +872,7 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
/* Clean up the links directory. */
if (options.action == GCOptions::gcDeleteDead || options.action == GCOptions::gcDeleteSpecific) {
- printError("deleting unused links...");
+ printInfo("deleting unused links...");
removeUnusedLinks(state);
}
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 63a825af0..59d551032 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -152,7 +152,7 @@ LocalStore::LocalStore(const Params & params)
globalLock = openLockFile(globalLockPath.c_str(), true);
if (!lockFile(globalLock.get(), ltRead, false)) {
- printError("waiting for the big Nix store lock...");
+ printInfo("waiting for the big Nix store lock...");
lockFile(globalLock.get(), ltRead, true);
}
@@ -183,7 +183,7 @@ LocalStore::LocalStore(const Params & params)
"please upgrade Nix to version 1.11 first.");
if (!lockFile(globalLock.get(), ltWrite, false)) {
- printError("waiting for exclusive access to the Nix store...");
+ printInfo("waiting for exclusive access to the Nix store...");
lockFile(globalLock.get(), ltWrite, true);
}
@@ -261,7 +261,7 @@ LocalStore::~LocalStore()
}
if (future.valid()) {
- printError("waiting for auto-GC to finish on exit...");
+ printInfo("waiting for auto-GC to finish on exit...");
future.get();
}
@@ -1210,7 +1210,7 @@ void LocalStore::invalidatePathChecked(const StorePath & path)
bool LocalStore::verifyStore(bool checkContents, RepairFlag repair)
{
- printError(format("reading the Nix store..."));
+ printInfo(format("reading the Nix store..."));
bool errors = false;
@@ -1251,7 +1251,7 @@ bool LocalStore::verifyStore(bool checkContents, RepairFlag repair)
});
if (repair) {
if (unlink(linkPath.c_str()) == 0)
- printError("removed link '%s'", linkPath);
+ printInfo("removed link '%s'", linkPath);
else
throw SysError("removing corrupt link '%s'", linkPath);
} else {
@@ -1294,14 +1294,14 @@ bool LocalStore::verifyStore(bool checkContents, RepairFlag repair)
/* Fill in missing hashes. */
if (info->narHash == nullHash) {
- printError("fixing missing hash on '%s'", printStorePath(i));
+ printInfo("fixing missing hash on '%s'", printStorePath(i));
info->narHash = current.first;
update = true;
}
/* Fill in missing narSize fields (from old stores). */
if (info->narSize == 0) {
- printError("updating size field on '%s' to %s", printStorePath(i), current.second);
+ printInfo("updating size field on '%s' to %s", printStorePath(i), current.second);
info->narSize = current.second;
update = true;
}
@@ -1360,7 +1360,7 @@ void LocalStore::verifyPath(const Path & pathS, const StringSet & store,
}
if (canInvalidate) {
- printError("path '%s' disappeared, removing from database...", pathS);
+ printInfo("path '%s' disappeared, removing from database...", pathS);
auto state(_state.lock());
invalidatePath(*state, path);
} else {
@@ -1431,7 +1431,7 @@ static void makeMutable(const Path & path)
void LocalStore::upgradeStore7()
{
if (getuid() != 0) return;
- printError("removing immutable bits from the Nix store (this may take a while)...");
+ printInfo("removing immutable bits from the Nix store (this may take a while)...");
makeMutable(realStoreDir);
}
diff --git a/src/libutil/logging.cc b/src/libutil/logging.cc
index 736ce604e..071a7ec7e 100644
--- a/src/libutil/logging.cc
+++ b/src/libutil/logging.cc
@@ -251,7 +251,11 @@ bool handleJSONLogMessage(const std::string & msg,
}
} catch (std::exception & e) {
- printError("bad log message from builder: %s", e.what());
+ logError(
+ ErrorInfo {
+ .name = "Json log message",
+ .hint = hintfmt("bad log message from builder: %s", e.what())
+ });
}
return true;
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index ac7c2967b..dcf89ff69 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -857,7 +857,7 @@ int Pid::kill()
#if __FreeBSD__ || __APPLE__
if (errno != EPERM || ::kill(pid, 0) != 0)
#endif
- printError((SysError("killing process %d", pid).msg()));
+ logError(SysError("killing process %d", pid).info());
}
return wait();
@@ -1447,17 +1447,6 @@ string base64Decode(const string & s)
}
-// void callFailure(const std::function<void(std::exception_ptr exc)> & failure, std::exception_ptr exc)
-// {
-// try {
-// failure(exc);
-// } catch (std::exception & e) {
-// printError("uncaught exception: %s", e.what());
-// abort();
-// }
-// }
-
-
static Sync<std::pair<unsigned short, unsigned short>> windowSize{{0, 0}};
diff --git a/src/nix-env/user-env.cc b/src/nix-env/user-env.cc
index 2484b9759..f804b77a0 100644
--- a/src/nix-env/user-env.cc
+++ b/src/nix-env/user-env.cc
@@ -146,7 +146,7 @@ bool createUserEnv(EvalState & state, DrvInfos & elems,
Path lockTokenCur = optimisticLockProfile(profile);
if (lockToken != lockTokenCur) {
- printError("profile '%1%' changed while we were busy; restarting", profile);
+ printInfo("profile '%1%' changed while we were busy; restarting", profile);
return false;
}
diff --git a/src/nix/make-content-addressable.cc b/src/nix/make-content-addressable.cc
index 8803461f4..0da4fa4b4 100644
--- a/src/nix/make-content-addressable.cc
+++ b/src/nix/make-content-addressable.cc
@@ -85,7 +85,7 @@ struct CmdMakeContentAddressable : StorePathsCommand, MixJSON
info.ca = makeFixedOutputCA(true, info.narHash);
if (!json)
- printError("rewrote '%s' to '%s'", pathS, store->printStorePath(info.path));
+ printInfo("rewrote '%s' to '%s'", pathS, store->printStorePath(info.path));
auto source = sinkToSource([&](Sink & nextSink) {
RewritingSink rsink2(oldHashPart, storePathToHash(store->printStorePath(info.path)), nextSink);
diff --git a/src/nix/upgrade-nix.cc b/src/nix/upgrade-nix.cc
index 9e7ebcd9c..fdf94e5a3 100644
--- a/src/nix/upgrade-nix.cc
+++ b/src/nix/upgrade-nix.cc
@@ -98,7 +98,7 @@ struct CmdUpgradeNix : MixDryRun, StoreCommand
{"--profile", profileDir, "-i", store->printStorePath(storePath), "--no-sandbox"});
}
- printError(ANSI_GREEN "upgrade to version %s done" ANSI_NORMAL, version);
+ printInfo(ANSI_GREEN "upgrade to version %s done" ANSI_NORMAL, version);
}
/* Return the profile in which Nix is installed. */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 05:46:28 +0000