From d861264ecf68b6708b450893445b2b3030143a5a Mon Sep 17 00:00:00 2001 From: Ben Phelps Date: Sun, 11 Sep 2022 11:13:54 +0300 Subject: [PATCH] fix error case cause failure to load anything --- src/pages/api/services/index.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/pages/api/services/index.js b/src/pages/api/services/index.js index a8dd08b79..0393e3d8a 100644 --- a/src/pages/api/services/index.js +++ b/src/pages/api/services/index.js @@ -1,8 +1,20 @@ import { servicesFromConfig, servicesFromDocker, cleanServiceGroups } from "utils/service-helpers"; export default async function handler(req, res) { - const discoveredServices = cleanServiceGroups(await servicesFromDocker()); - const configuredServices = cleanServiceGroups(await servicesFromConfig()); + let discoveredServices; + let configuredServices; + + try { + discoveredServices = cleanServiceGroups(await servicesFromDocker()); + } catch { + discoveredServices = []; + } + + try { + configuredServices = cleanServiceGroups(await servicesFromConfig()); + } catch { + configuredServices = []; + } const mergedGroupsNames = [ ...new Set([discoveredServices.map((group) => group.name), configuredServices.map((group) => group.name)].flat()),