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

Add aws-region param to S3 store URLs

Browse source
This commit is contained in:
Shea Levy 2017-03-03 16:12:17 -05:00
parent d1158bb816
commit 5789eaa3f4
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libstore/s3-binary-cache-store.cc
View file

@ -52,8 +52,8 @@ static void initAWS()
});
}
S3Helper::S3Helper()
: config(makeConfig())
S3Helper::S3Helper(const string & region)
: config(makeConfig(region))
, client(make_ref<Aws::S3::S3Client>(*config))
{
}
@ -70,11 +70,11 @@ class RetryStrategy : public Aws::Client::DefaultRetryStrategy
}
};
ref<Aws::Client::ClientConfiguration> S3Helper::makeConfig()
ref<Aws::Client::ClientConfiguration> S3Helper::makeConfig(const string & region)
{
initAWS();
auto res = make_ref<Aws::Client::ClientConfiguration>();
res->region = Aws::Region::US_EAST_1; // FIXME: make configurable
res->region = region;
res->requestTimeoutMs = 600 * 1000;
res->retryStrategy = std::make_shared<RetryStrategy>();
return res;
@ -140,6 +140,7 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
const Params & params, const std::string & bucketName)
: S3BinaryCacheStore(params)
, bucketName(bucketName)
, s3Helper(get(params, "aws-region", Aws::Region::US_EAST_1))
{
diskCache = getNarInfoDiskCache();
}