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

Make the store plugins more introspectable

Browse source 
Directly register the store classes rather than a function to build an
instance of them.
This gives the possibility to introspect static members of the class or
choose different ways of instantiating them.
This commit is contained in:
regnat 2020-09-08 14:50:23 +02:00
parent 609a6d6d9f
commit 7d5bdf8b56
18 changed files with 141 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/libstore/http-binary-cache-store.cc
View file

@ -24,7 +24,8 @@ private:
public:
HttpBinaryCacheStore(
const Params & params, const Path & _cacheUri)
const Path & _cacheUri,
const Params & params)
: BinaryCacheStore(params)
, cacheUri(_cacheUri)
{
@ -55,6 +56,13 @@ public:
}
}
static std::vector<std::string> uriPrefixes()
{
static bool forceHttp = getEnv("_NIX_FORCE_HTTP") == "1";
auto ret = std::vector<std::string>({"http", "https"});
if (forceHttp) ret.push_back("file");
return ret;
}
protected:
void maybeDisable()
@ -162,18 +170,6 @@ protected:
};
static RegisterStoreImplementation regStore([](
const std::string & uri, const Store::Params & params)
-> std::shared_ptr<Store>
{
static bool forceHttp = getEnv("_NIX_FORCE_HTTP") == "1";
if (std::string(uri, 0, 7) != "http://" &&
std::string(uri, 0, 8) != "https://" &&
(!forceHttp || std::string(uri, 0, 7) != "file://"))
return 0;
auto store = std::make_shared<HttpBinaryCacheStore>(params, uri);
store->init();
return store;
});
[[maybe_unused]] static RegisterStoreImplementation<HttpBinaryCacheStore> regStore();
}