delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use store-api for binary cache instantiation

Browse source
This commit is contained in:
Alexander Ried 2016-05-12 10:15:15 +02:00 committed by Eelco Dolstra
parent 1c2f6281b9
commit a73f211bf2
1 changed files with 4 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/hydra-queue-runner/hydra-queue-runner.cc
View file

@ -7,7 +7,7 @@
#include "state.hh"
#include "build-result.hh"
#include "s3-binary-cache-store.hh"
#include "store-api.hh"
#include "shared.hh"
#include "globals.hh"
@ -794,34 +794,12 @@ void State::run(BuildID buildOne)
if (!lock)
throw Error("hydra-queue-runner is already running");
auto storeMode = hydraConfig["store_mode"];
_localStore = openStore();
if (storeMode == "direct" || storeMode == "") {
if (hydraConfig["store_uri"] == "") {
_destStore = _localStore;
}
else if (storeMode == "local-binary-cache") {
auto dir = hydraConfig["binary_cache_dir"];
if (dir == "")
throw Error("you must set ‘binary_cache_dir’ in hydra.conf");
_destStore = openLocalBinaryCacheStore(
_localStore,
hydraConfig["binary_cache_secret_key_file"],
dir);
}
else if (storeMode == "s3-binary-cache") {
auto bucketName = hydraConfig["binary_cache_s3_bucket"];
if (bucketName == "")
throw Error("you must set ‘binary_cache_s3_bucket’ in hydra.conf");
auto store = make_ref<S3BinaryCacheStore>(
_localStore,
hydraConfig["binary_cache_secret_key_file"],
bucketName);
store->init();
_destStore = std::shared_ptr<S3BinaryCacheStore>(store);
} else {
_destStore = openStoreAt(hydraConfig["store_uri"]);
}
{