the-distro/hydra
1
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Fix build

Browse source
This commit is contained in:
Eelco Dolstra 2016-03-04 17:51:32 +01:00
parent 76104accda
commit e7ce225558
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -773,7 +773,6 @@ void State::run(BuildID buildOne)
_destStore = openLocalBinaryCacheStore( _destStore = openLocalBinaryCacheStore(
_localStore, _localStore,
hydraConfig["binary_cache_secret_key_file"], hydraConfig["binary_cache_secret_key_file"],
hydraConfig["binary_cache_public_key_file"],
dir); dir);
} }
@ -784,7 +783,6 @@ void State::run(BuildID buildOne)
auto store = make_ref<S3BinaryCacheStore>( auto store = make_ref<S3BinaryCacheStore>(
_localStore, _localStore,
hydraConfig["binary_cache_secret_key_file"], hydraConfig["binary_cache_secret_key_file"],
hydraConfig["binary_cache_public_key_file"],
bucketName); bucketName);
store->init(); store->init();
_destStore = std::shared_ptr<S3BinaryCacheStore>(store); _destStore = std::shared_ptr<S3BinaryCacheStore>(store);

6
src/hydra-queue-runner/s3-binary-cache-store.cc
View file

@ -32,9 +32,8 @@ R && checkAws(const FormatOrString & fs, Aws::Utils::Outcome<R, E> && outcome)
} }
S3BinaryCacheStore::S3BinaryCacheStore(std::shared_ptr<Store> localStore, S3BinaryCacheStore::S3BinaryCacheStore(std::shared_ptr<Store> localStore,
const Path & secretKeyFile, const Path & publicKeyFile, const Path & secretKeyFile, const std::string & bucketName)
const std::string & bucketName) : BinaryCacheStore(localStore, secretKeyFile)
: BinaryCacheStore(localStore, secretKeyFile, publicKeyFile)
, bucketName(bucketName) , bucketName(bucketName)
, config(makeConfig()) , config(makeConfig())
, client(make_ref<Aws::S3::S3Client>(*config)) , client(make_ref<Aws::S3::S3Client>(*config))
@ -177,4 +176,3 @@ std::string S3BinaryCacheStore::getFile(const std::string & path)
} }
} }

3
src/hydra-queue-runner/s3-binary-cache-store.hh
View file

@ -21,8 +21,7 @@ private:
public: public:
S3BinaryCacheStore(std::shared_ptr<Store> localStore, S3BinaryCacheStore(std::shared_ptr<Store> localStore,
const Path & secretKeyFile, const Path & publicKeyFile, const Path & secretKeyFile, const std::string & bucketName);
const std::string & bucketName);
void init() override; void init() override;