diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2021-12-09 15:31:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-09 15:31:08 +0100 |
| commit | bc57b3854e75d3f20929fd63d69a98b8237f23b2 (patch) | |
| tree | da2287e97f3934dba473cbfeeb1748125760a6de /src/libstore | |
| parent | 75654bacc571bf4c193599ecd68f7c94d63994e7 (diff) | |
| parent | 1f15441103caab1b41317a6107fc2560eb109a4a (diff) | |
Merge pull request #5695 from obsidiansystems/tidy-logging
Tidy up the logging
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/daemon.cc | 4 | ||||
| -rw-r--r-- | src/libstore/store-api.cc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc index dc4889dfd..bafab6fd5 100644 --- a/src/libstore/daemon.cc +++ b/src/libstore/daemon.cc @@ -956,7 +956,7 @@ void processConnection( Finally finally([&]() { _isInterrupted = false; - prevLogger->log(lvlDebug, fmt("%d operations", opCount)); + printMsgUsing(prevLogger, lvlDebug, "%d operations", opCount); }); if (GET_PROTOCOL_MINOR(clientVersion) >= 14 && readInt(from)) { @@ -989,6 +989,8 @@ void processConnection( break; } + printMsgUsing(prevLogger, lvlDebug, "received daemon op %d", op); + opCount++; try { diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc index 71350906e..aab4ce94c 100644 --- a/src/libstore/store-api.cc +++ b/src/libstore/store-api.cc @@ -1079,7 +1079,7 @@ std::map<StorePath, StorePath> copyPaths( nrFailed++; if (!settings.keepGoing) throw e; - logger->log(lvlError, fmt("could not copy %s: %s", dstStore.printStorePath(storePath), e.what())); + printMsg(lvlError, "could not copy %s: %s", dstStore.printStorePath(storePath), e.what()); showProgress(); return; } |