Merge branch 'master' into nymkappa/accelerate-preview-login-cta

This commit is contained in:
nymkappa authored and GitHub committed 2023-09-12 14:34:22 +02:00
commit a8e6d9b4b9
2 files changed
+3 -3

No files matched your search

+2 -2
View File
@@ -75,9 +75,9 @@ class FailoverRouter {
const results = await Promise.allSettled(this.hosts.map(async (host) => {
if (host.socket) {
return this.pollConnection.get<number>('/blocks/tip/height', { socketPath: host.host, timeout: 2000 });
return this.pollConnection.get<number>('/blocks/tip/height', { socketPath: host.host, timeout: 5000 });
} else {
return this.pollConnection.get<number>(host.host + '/blocks/tip/height', { timeout: 2000 });
return this.pollConnection.get<number>(host.host + '/blocks/tip/height', { timeout: 5000 });
}
}));
const maxHeight = results.reduce((max, result) => Math.max(max, result.status === 'fulfilled' ? result.value?.data || 0 : 0), 0);
+1 -1
View File
@@ -1793,7 +1793,7 @@ case $OS in
esac
# wait for mysql to start
sleep 5
sleep 10
mysql << _EOF_
create database mempool;