lehmanator/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

libstore: remove one Resource::good flag

Browse source 
usage of this flag previously kept connections open much longer than
necessary, and at the same time obscured that a connection was being
dropped when it *was* set. new variable names clarify this somewhat.

Change-Id: I11f6f08f37a5e4dc04ea6c6036ea589154b121c6
This commit is contained in:
eldritch horrors 2024-03-21 21:45:17 +01:00
parent 0b6d353474
commit c777dcd1ae
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libstore/legacy-ssh-store.cc
View file

@ -46,7 +46,6 @@ struct LegacySSHStore : public virtual LegacySSHStoreConfig, public virtual Stor
FdSink to; FdSink to;
FdSource from; FdSource from;
ServeProto::Version remoteVersion; ServeProto::Version remoteVersion;
bool good = true;
/** /**
* Coercion to `ServeProto::ReadConn`. This makes it easy to use the * Coercion to `ServeProto::ReadConn`. This makes it easy to use the
@ -97,8 +96,7 @@ struct LegacySSHStore : public virtual LegacySSHStoreConfig, public virtual Stor
, host(host) , host(host)
, connections(make_ref<Pool<Connection>>( , connections(make_ref<Pool<Connection>>(
std::max(1, (int) maxConnections), std::max(1, (int) maxConnections),
[this]() { return openConnection(); }, [this]() { return openConnection(); }
[](const ref<Connection> & r) { return r->good; }
)) ))
, master( , master(
host, host,
@ -196,12 +194,7 @@ struct LegacySSHStore : public virtual LegacySSHStoreConfig, public virtual Stor
<< info.ultimate << info.ultimate
<< info.sigs << info.sigs
<< renderContentAddress(info.ca); << renderContentAddress(info.ca);
try {
copyNAR(source, conn->to); copyNAR(source, conn->to);
} catch (...) {
conn->good = false;
throw;
}
conn->to.flush(); conn->to.flush();
} else { } else {
@ -209,12 +202,7 @@ struct LegacySSHStore : public virtual LegacySSHStoreConfig, public virtual Stor
conn->to conn->to
<< ServeProto::Command::ImportPaths << ServeProto::Command::ImportPaths
<< 1; << 1;
try {
copyNAR(source, conn->to); copyNAR(source, conn->to);
} catch (...) {
conn->good = false;
throw;
}
conn->to conn->to
<< exportMagic << exportMagic
<< printStorePath(info.path); << printStorePath(info.path);