Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: caf297a9d34b
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 806291d18ca3
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 15, 2019

  1. Add a 5 seconds of timeouts to connect to S3. 

    The default is 1000ms, but we can hit it a lot of we don't have direct
link to AWS (e.g. using VPN).
    @benhamad
    benhamad committed Mar 15, 2019
    Copy the full SHA
    81a23fa View commit details

  2. Merge pull request #2727 from Chakerbh/master 

    Add a 5 seconds of timeout to connecting to S3.
    @edolstra
    edolstra authored Mar 15, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    806291d View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 src/libstore/s3-binary-cache-store.cc
1 change: 1 addition & 0 deletions src/libstore/s3-binary-cache-store.cc
View file
Original file line number Diff line number Diff line change
@@ -126,6 +126,7 @@ ref<Aws::Client::ClientConfiguration> S3Helper::makeConfig(const string & region
res->endpointOverride = endpoint;
}
res->requestTimeoutMs = 600 * 1000;
res->connectTimeoutMs = 5 * 1000;
res->retryStrategy = std::make_shared<RetryStrategy>();
res->caFile = settings.caFile;
return res;