Skip to content

Commit

Permalink
Merge pull request #135 from dpaulat/hotfix/aws-timeout
Browse files Browse the repository at this point in the history
AWS Timeout with higher latency connections
  • Loading branch information
dpaulat authored Jan 22, 2024
2 parents bdd9049 + 1b4218a commit 6f73c19
Show file tree
Hide file tree
Showing 4 changed files with 85 additions and 6 deletions.
80 changes: 79 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,84 @@
{
"cmake.configureOnOpen": false,
"files.associations": {
"qfile": "cpp"
"qfile": "cpp",
"cctype": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"any": "cpp",
"array": "cpp",
"atomic": "cpp",
"strstream": "cpp",
"bit": "cpp",
"*.tcc": "cpp",
"bitset": "cpp",
"cfenv": "cpp",
"charconv": "cpp",
"chrono": "cpp",
"cinttypes": "cpp",
"codecvt": "cpp",
"compare": "cpp",
"complex": "cpp",
"concepts": "cpp",
"condition_variable": "cpp",
"csignal": "cpp",
"cstdint": "cpp",
"deque": "cpp",
"forward_list": "cpp",
"list": "cpp",
"map": "cpp",
"set": "cpp",
"string": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"vector": "cpp",
"exception": "cpp",
"algorithm": "cpp",
"functional": "cpp",
"iterator": "cpp",
"memory": "cpp",
"memory_resource": "cpp",
"numeric": "cpp",
"optional": "cpp",
"random": "cpp",
"ratio": "cpp",
"regex": "cpp",
"source_location": "cpp",
"string_view": "cpp",
"system_error": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"utility": "cpp",
"fstream": "cpp",
"future": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"limits": "cpp",
"mutex": "cpp",
"new": "cpp",
"numbers": "cpp",
"ostream": "cpp",
"ranges": "cpp",
"semaphore": "cpp",
"shared_mutex": "cpp",
"sstream": "cpp",
"stdexcept": "cpp",
"stop_token": "cpp",
"streambuf": "cpp",
"thread": "cpp",
"typeindex": "cpp",
"typeinfo": "cpp",
"variant": "cpp"
}
}
2 changes: 1 addition & 1 deletion external/aws-sdk-cpp
Submodule aws-sdk-cpp updated 2024 files
6 changes: 3 additions & 3 deletions tools/setup-common.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
pip install --upgrade --user --break-system-packages "conan<2.0"
pip install --upgrade --user --break-system-packages geopandas
pip install --upgrade --user --break-system-packages GitPython
pip install --upgrade --user "conan<2.0"
pip install --upgrade --user geopandas
pip install --upgrade --user GitPython
conan profile new default --detect
3 changes: 2 additions & 1 deletion wxdata/source/scwx/provider/aws_nexrad_data_provider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ class AwsNexradDataProvider::Impl
util::SetEnvironment("AWS_EC2_METADATA_DISABLED", "true");

Aws::Client::ClientConfiguration config;
config.region = region_;
config.region = region_;
config.connectTimeoutMs = 10000;

client_ = std::make_shared<Aws::S3::S3Client>(config);
}
Expand Down

0 comments on commit 6f73c19

Please sign in to comment.