From b40b786839bbcfcbbd0c4d22a2e2725b9f7a2de9 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Thu, 15 Jan 2026 22:32:08 +0300 Subject: [PATCH] libstore/remote-store: Add checkInterrupt in openConnectionWrapper This avoids the wall of text like, because ThreadPool doesn't print interrupts on shutdowns. error (ignored): opening a connection to remote store 'ssh-ng://127.0.0.1' previously failed error (ignored): opening a connection to remote store 'ssh-ng://127.0.0.1' previously failed error (ignored): opening a connection to remote store 'ssh-ng://127.0.0.1' previously failed error (ignored): opening a connection to remote store 'ssh-ng://127.0.0.1' previously failed error (ignored): opening a connection to remote store 'ssh-ng://127.0.0.1' previously failed error (ignored): opening a connection to remote store 'ssh-ng://127.0.0.1' previously failed error (ignored): opening a connection to remote store 'ssh-ng://127.0.0.1' previously failed --- src/libstore/remote-store.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index 22af53ae8..f80080140 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -58,8 +58,13 @@ RemoteStore::RemoteStore(const Config & config) ref RemoteStore::openConnectionWrapper() { - if (failed) + if (failed) { + checkInterrupt(); + /* Throw Interrupted instead of the following error to silence pesky + warning messages that ThreadPool prints on shutdown if other threads + failed. */ throw Error("opening a connection to remote store '%s' previously failed", config.getHumanReadableURI()); + } try { return openConnection(); } catch (...) {