Skip to content

Commit 4c2038e

Browse files
MisterTeaMisterTea
authored
Increase socket timeout to 30s (#642)
* Increase socket timeout to 30s * change keys * rev vcpkg * add autoconf and libtool * add automake * fix infinite telemetry shutdown loop
1 parent 271d2a6 commit 4c2038e

11 files changed

+26
-25
lines changed

‎.circleci/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
command: mkdir -p ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
1010
- run:
1111
name: Install system dependencies
12-
command: sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get -y update; sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -y curl zip unzip tar libssl-dev libcurl4-openssl-dev libunwind-dev git cmake ninja-build libutempter-dev build-essential openssh-server protobuf-compiler libsodium-dev libgflags-dev libprotobuf-dev
12+
command: sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get -y update; sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -y curl zip unzip tar libssl-dev libcurl4-openssl-dev libunwind-dev git cmake ninja-build libutempter-dev build-essential openssh-server protobuf-compiler libsodium-dev libgflags-dev libprotobuf-dev libtool libtool-bin autoconf
1313
- checkout
1414
- run:
1515
name: Set up ssh & known_hosts
@@ -67,7 +67,7 @@ jobs:
6767
command: mkdir -p ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
6868
- run:
6969
name: Install system dependencies
70-
command: sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get -y update; sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -y curl zip unzip tar libssl-dev libcurl4-openssl-dev libunwind-dev git cmake ninja-build libutempter-dev build-essential openssh-server
70+
command: sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get -y update; sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -y curl zip unzip tar libssl-dev libcurl4-openssl-dev libunwind-dev git cmake ninja-build libutempter-dev build-essential openssh-server libtool libtool-bin autoconf
7171
- checkout
7272
- run:
7373
name: Set up ssh & known_hosts

‎.github/workflows/codecov.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
mkdir -p ~/.ssh/
1919
echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
2020
sudo apt-get update
21-
sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -y curl zip unzip tar libssl-dev libcurl4-openssl-dev libunwind-dev git cmake ninja-build gdb protobuf-compiler libsodium-dev libgflags-dev libprotobuf-dev libutempter-dev g++ lcov
21+
sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -y curl zip unzip tar libssl-dev libcurl4-openssl-dev libunwind-dev git cmake ninja-build gdb protobuf-compiler libsodium-dev libgflags-dev libprotobuf-dev libutempter-dev g++ lcov libtool libtool-bin autoconf
2222
2323
echo "Host localhost\n Port 2222\n\n" >> ~/.ssh/config
2424
@@ -50,7 +50,7 @@ jobs:
5050
# The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm.
5151
# Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already).
5252
key: |
53-
et-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-linux-codecov
53+
et-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-linux-codecov-1
5454
5555
- name: Build
5656
run: |

‎.github/workflows/linux_ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
mkdir -p ~/.ssh/
2222
echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
2323
sudo apt-get update
24-
sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -y curl zip unzip tar libssl-dev libcurl4-openssl-dev libunwind-dev git cmake ninja-build gdb protobuf-compiler libsodium-dev libgflags-dev libprotobuf-dev libutempter-dev g++
24+
sudo DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -y curl zip unzip tar libssl-dev libcurl4-openssl-dev libunwind-dev git cmake ninja-build gdb protobuf-compiler libsodium-dev libgflags-dev libprotobuf-dev libutempter-dev g++ libtool libtool-bin autoconf
2525
2626
echo "Host localhost\n Port 2222\n\n" >> ~/.ssh/config
2727
@@ -53,7 +53,7 @@ jobs:
5353
# The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm.
5454
# Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already).
5555
key: |
56-
et-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-linux-${{ matrix.sanitize }}
56+
et-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-linux-${{ matrix.sanitize }}-1
5757
5858
- name: Build with ubsan
5959
run: |

‎.github/workflows/mac_ci.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
run: |
1818
mkdir -p ~/.ssh/
1919
echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
20-
brew install cmake ninja; brew install protobuf libsodium
20+
brew install cmake ninja; brew install protobuf libsodium automake autoconf libtool
2121
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
2222
git submodule sync --recursive
2323
git submodule update --init --force --recursive
@@ -39,7 +39,7 @@ jobs:
3939
# The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm.
4040
# Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already).
4141
key: |
42-
et-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-osx
42+
et-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-osx-1
4343
4444
4545
- name: Test with ubsan
@@ -65,7 +65,7 @@ jobs:
6565
git submodule update --init --force --recursive
6666
mkdir -p ~/.ssh/
6767
echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
68-
brew install cmake ninja; brew install protobuf libsodium
68+
brew install cmake ninja; brew install protobuf libsodium automake autoconf libtool
6969
7070
# Restore both vcpkg and its artifacts from the GitHub cache service.
7171
- name: Restore vcpkg and its artifacts.
@@ -84,7 +84,7 @@ jobs:
8484
# The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm.
8585
# Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already).
8686
key: |
87-
et-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-osx
87+
et-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-osx-1
8888
8989
- name: Test with asan
9090
run: |
@@ -109,7 +109,7 @@ jobs:
109109
git submodule update --init --force --recursive
110110
mkdir -p ~/.ssh/
111111
echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
112-
brew install cmake ninja; brew install protobuf libsodium
112+
brew install cmake ninja; brew install protobuf libsodium automake autoconf libtool
113113
114114
# Restore both vcpkg and its artifacts from the GitHub cache service.
115115
- name: Restore vcpkg and its artifacts.
@@ -128,7 +128,7 @@ jobs:
128128
# The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm.
129129
# Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already).
130130
key: |
131-
et-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-osx
131+
et-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-osx-1
132132
133133
- name: Test with msan
134134
run: |
@@ -153,7 +153,7 @@ jobs:
153153
git submodule update --init --force --recursive
154154
mkdir -p ~/.ssh/
155155
echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
156-
brew install cmake ninja; brew install protobuf libsodium
156+
brew install cmake ninja; brew install protobuf libsodium automake autoconf libtool
157157
158158
# Restore both vcpkg and its artifacts from the GitHub cache service.
159159
- name: Restore vcpkg and its artifacts.
@@ -172,7 +172,7 @@ jobs:
172172
# The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm.
173173
# Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already).
174174
key: |
175-
et-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-osx
175+
et-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-osx-1
176176
177177
- name: Test with tsan
178178
run: |

‎.github/workflows/novcpkg_build_master.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
libunwind-dev
5555
if: matrix.os == 'ubuntu-latest'
5656
- name: Install Dependencies (macOS)
57-
run: brew update && brew install ninja cmake pkg-config curl openssl protobuf libsodium
57+
run: brew update && brew install ninja cmake pkg-config curl openssl protobuf libsodium automake autoconf libtool
5858
if: matrix.os == 'macos-latest'
5959

6060
- uses: actions/checkout@v4

‎.github/workflows/novcpkg_build_release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
libunwind-dev
5757
if: matrix.os == 'ubuntu-latest'
5858
- name: Install Dependencies (macOS)
59-
run: brew update && brew install ninja cmake pkg-config curl openssl protobuf libsodium
59+
run: brew update && brew install ninja cmake pkg-config curl openssl protobuf libsodium automake autoconf libtool
6060
if: matrix.os == 'macos-latest'
6161

6262
- uses: actions/checkout@v4

‎.github/workflows/vcpkg_build_master.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
run: choco install -y ninja
6363
if: matrix.os == 'windows-latest'
6464
- name: Install Dependencies (macOS)
65-
run: brew update && brew install ninja cmake
65+
run: brew update && brew install ninja cmake automake autoconf libtool
6666
if: matrix.os == 'macos-latest'
6767

6868
- uses: actions/checkout@v4
@@ -89,7 +89,7 @@ jobs:
8989
# The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm.
9090
# Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already).
9191
key: |
92-
et-2-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-${{ matrix.os }}-${{ matrix.gcc }}-master
92+
et-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-${{ matrix.os }}-${{ matrix.gcc }}-master-1
9393
9494
- name: Show content of workspace after cache has been restored
9595
run: find $RUNNER_WORKSPACE

‎.github/workflows/vcpkg_build_release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
run: choco install -y ninja
6565
if: matrix.os == 'windows-latest'
6666
- name: Install Dependencies (macOS)
67-
run: brew update && brew install ninja cmake
67+
run: brew update && brew install ninja cmake automake autoconf libtool
6868
if: matrix.os == 'macos-latest'
6969

7070
- uses: actions/checkout@v4
@@ -91,7 +91,7 @@ jobs:
9191
# The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm.
9292
# Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already).
9393
key: |
94-
et-2-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-${{ matrix.os }}-${{ matrix.gcc }}-release
94+
et-vcpkg-${{ hashFiles( 'vcpkg.json' ) }}-${{ hashFiles( '.git/modules/external/vcpkg/HEAD' )}}-${{ matrix.os }}-${{ matrix.gcc }}-release-1
9595
9696
- name: Show content of workspace after cache has been restored
9797
run: find $RUNNER_WORKSPACE

‎external/vcpkg

Submodule vcpkg updated 3370 files

‎src/base/SocketHandler.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
#include "base64.h"
44

55
namespace et {
6-
#define SOCKET_DATA_TRANSFER_TIMEOUT (10)
6+
#define SOCKET_DATA_TRANSFER_TIMEOUT (30)
77

88
void SocketHandler::readAll(int fd, void* buf, size_t count, bool timeout) {
99
time_t startTime = time(NULL);
1010
size_t pos = 0;
1111
while (pos < count) {
1212
if (!waitOnSocketData(fd)) {
1313
time_t currentTime = time(NULL);
14-
if (timeout && currentTime > startTime + 10) {
14+
if (timeout && currentTime > startTime + SOCKET_DATA_TRANSFER_TIMEOUT) {
1515
throw std::runtime_error("Socket Timeout");
1616
}
1717
continue;
@@ -46,7 +46,7 @@ int SocketHandler::writeAllOrReturn(int fd, const void* buf, size_t count) {
4646
time_t startTime = time(NULL);
4747
while (pos < count) {
4848
time_t currentTime = time(NULL);
49-
if (currentTime > startTime + 10) {
49+
if (currentTime > startTime + SOCKET_DATA_TRANSFER_TIMEOUT) {
5050
return -1;
5151
}
5252
ssize_t bytesWritten = write(fd, ((const char*)buf) + pos, count - pos);
@@ -77,7 +77,7 @@ void SocketHandler::writeAllOrThrow(int fd, const void* buf, size_t count,
7777
size_t pos = 0;
7878
while (pos < count) {
7979
time_t currentTime = time(NULL);
80-
if (timeout && currentTime > startTime + 10) {
80+
if (timeout && currentTime > startTime + SOCKET_DATA_TRANSFER_TIMEOUT) {
8181
throw std::runtime_error("Socket Timeout");
8282
}
8383
ssize_t bytesWritten = write(fd, ((const char*)buf) + pos, count - pos);

‎src/terminal/TelemetryService.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ void shutdownTelemetry() {
7979
if (TelemetryService::exists()) {
8080
cerr << "Shutting down sentry" << endl;
8181
auto ts = TelemetryService::get();
82+
TelemetryService::destroy();
8283
ts->shutdown();
8384
}
8485
}

0 commit comments

Comments
 (0)