LumeWeb
/
skynet-webportal
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into matt/sky-571-update-webportal-docker-compose

This commit is contained in:
Karol Wypchło 2022-05-27 11:32:46 +02:00 committed by GitHub
parent 40381e0afb dab29fead5
commit 51926242de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/health-check/bin/cli
View File

@ -71,7 +71,7 @@ require("yargs/yargs")(process.argv.slice(2))
const entry = { const entry = {
date: new Date().toISOString(), date: new Date().toISOString(),
checks: (await Promise.all(checks.map((check) => new Promise(check)))).map(middleware), checks: (await Promise.all(checks.map((check) => new Promise(check)))).filter(Boolean).map(middleware),
}; };
db.read() // read before writing to make sure no external changes are overwritten db.read() // read before writing to make sure no external changes are overwritten

5
packages/health-check/src/checks/critical.js
View File

@ -122,8 +122,9 @@ async function registryWriteAndReadCheck(done) {
// directServerApiAccessCheck returns the basic server api check on direct server address // directServerApiAccessCheck returns the basic server api check on direct server address
async function directServerApiAccessCheck(done) { async function directServerApiAccessCheck(done) {
if (!process.env.SERVER_DOMAIN) { // skip if SERVER_DOMAIN is not set or it equals PORTAL_DOMAIN (single server portals)
return done({ up: false, errors: [{ message: "SERVER_DOMAIN env variable not configured" }] }); if (!process.env.SERVER_DOMAIN || process.env.SERVER_DOMAIN === process.env.PORTAL_DOMAIN) {
return done();
} }
const [portalAccessCheck, serverAccessCheck] = await Promise.all([ const [portalAccessCheck, serverAccessCheck] = await Promise.all([