Karl/homepage
1
0
Fork 0
mirror of https://github.com/karl0ss/homepage.git synced 2025-05-05 23:13:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #719 from benphelps/docker-server-failovers

Browse Source 
Fix: Handle docker server failures if others succeed
This commit is contained in:
shamoon 2022-12-28 18:40:08 -08:00 committed by GitHub
commit 0e1aeaf54c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/config/api-response.js
View File

@ -52,7 +52,7 @@ export async function servicesResponse() {
discoveredServices = cleanServiceGroups(await servicesFromDocker()); discoveredServices = cleanServiceGroups(await servicesFromDocker());
} catch (e) { } catch (e) {
console.error("Failed to discover services, please check docker.yaml for errors or remove example entries."); console.error("Failed to discover services, please check docker.yaml for errors or remove example entries.");
if (e) console.error(e); if (e) console.error(e.toString());
discoveredServices = []; discoveredServices = [];
} }
@ -60,7 +60,7 @@ export async function servicesResponse() {
configuredServices = cleanServiceGroups(await servicesFromConfig()); configuredServices = cleanServiceGroups(await servicesFromConfig());
} catch (e) { } catch (e) {
console.error("Failed to load services.yaml, please check for errors"); console.error("Failed to load services.yaml, please check for errors");
if (e) console.error(e); if (e) console.error(e.toString());
configuredServices = []; configuredServices = [];
} }
@ -68,7 +68,7 @@ export async function servicesResponse() {
initialSettings = await getSettings(); initialSettings = await getSettings();
} catch (e) { } catch (e) {
console.error("Failed to load settings.yaml, please check for errors"); console.error("Failed to load settings.yaml, please check for errors");
if (e) console.error(e); if (e) console.error(e.toString());
initialSettings = {}; initialSettings = {};
} }

9
src/utils/config/service-helpers.js
View File

@ -44,6 +44,7 @@ export async function servicesFromDocker() {
const serviceServers = await Promise.all( const serviceServers = await Promise.all(
Object.keys(servers).map(async (serverName) => { Object.keys(servers).map(async (serverName) => {
try {
const docker = new Docker(getDockerArguments(serverName).conn); const docker = new Docker(getDockerArguments(serverName).conn);
const containers = await docker.listContainers({ const containers = await docker.listContainers({
all: true, all: true,
@ -74,9 +75,17 @@ export async function servicesFromDocker() {
}); });
return { server: serverName, services: discovered.filter((filteredService) => filteredService) }; return { server: serverName, services: discovered.filter((filteredService) => filteredService) };
} catch (e) {
// a server failed, but others may succeed
return { server: serverName, services: [] };
}
}) })
); );
if (serviceServers.every(server => server.services.length === 0)) {
throw new Error('All docker servers failed to connect or returned no containers');
}
const mappedServiceGroups = []; const mappedServiceGroups = [];
serviceServers.forEach((server) => { serviceServers.forEach((server) => {