mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

add two more cloud servers to the rotation

Browse source 
This is not a great way to load-balance, but it works and doesn't require
high end hardware on the backend.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2023-12-27 13:54:50 -08:00
parent b3d2a8cdcb
commit 7792e227da
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/checkcloudconnection.cpp
View file

@ -103,7 +103,9 @@ bool CheckCloudConnection::nextServer()
}; };
static struct serverTried cloudServers[] = { static struct serverTried cloudServers[] = {
{ CLOUD_HOST_EU, false }, { CLOUD_HOST_EU, false },
{ CLOUD_HOST_US, false } { CLOUD_HOST_US, false },
{ CLOUD_HOST_E2, false },
{ CLOUD_HOST_U2, false }
}; };
const char *server = nullptr; const char *server = nullptr;
for (serverTried &item: cloudServers) { for (serverTried &item: cloudServers) {

6
core/git-access.c
View file

@ -306,7 +306,11 @@ int certificate_check_cb(git_cert *cert, int valid, const char *host, void *payl
UNUSED(payload); UNUSED(payload);
if (verbose) if (verbose)
SSRF_INFO("git storage: certificate callback for host %s with validity %d\n", host, valid); SSRF_INFO("git storage: certificate callback for host %s with validity %d\n", host, valid);
if ((same_string(host, CLOUD_HOST_GENERIC) || same_string(host, CLOUD_HOST_US) || same_string(host, CLOUD_HOST_EU)) && if ((same_string(host, CLOUD_HOST_GENERIC) ||
same_string(host, CLOUD_HOST_US) ||
same_string(host, CLOUD_HOST_U2) ||
same_string(host, CLOUD_HOST_EU) ||
same_string(host, CLOUD_HOST_E2)) &&
cert->cert_type == GIT_CERT_X509) { cert->cert_type == GIT_CERT_X509) {
// for some reason the LetsEncrypt certificate makes libgit2 throw up on some // for some reason the LetsEncrypt certificate makes libgit2 throw up on some
// platforms but not on others // platforms but not on others

2
core/git-access.h
View file

@ -14,7 +14,9 @@ extern "C" {
#endif #endif
#define CLOUD_HOST_US "ssrf-cloud-us.subsurface-divelog.org" #define CLOUD_HOST_US "ssrf-cloud-us.subsurface-divelog.org"
#define CLOUD_HOST_U2 "ssrf-cloud-u2.subsurface-divelog.org"
#define CLOUD_HOST_EU "ssrf-cloud-eu.subsurface-divelog.org" #define CLOUD_HOST_EU "ssrf-cloud-eu.subsurface-divelog.org"
#define CLOUD_HOST_E2 "ssrf-cloud-e2.subsurface-divelog.org"
#define CLOUD_HOST_PATTERN "ssrf-cloud-..\\.subsurface-divelog\\.org" #define CLOUD_HOST_PATTERN "ssrf-cloud-..\\.subsurface-divelog\\.org"
#define CLOUD_HOST_GENERIC "cloud.subsurface-divelog.org" #define CLOUD_HOST_GENERIC "cloud.subsurface-divelog.org"