Lissy93/dashy
1
1
Fork 0
mirror of https://github.com/Lissy93/dashy.git synced 2024-12-27 19:03:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

🔀 Merge pull request #1076 from rtm516/master

Browse Source 
Fix health-check when using SSL
This commit is contained in:
Alicia Sykes 2023-01-21 20:47:13 +00:00 committed by GitHub
commit ddd7c0f4be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -50,4 +50,4 @@ CMD [ "yarn", "start" ]
EXPOSE ${PORT} EXPOSE ${PORT}
# Run simple healthchecks every 5 mins, to check that everythings still great # Run simple healthchecks every 5 mins, to check that everythings still great
HEALTHCHECK --interval=5m --timeout=2s --start-period=30s CMD yarn health-check HEALTHCHECK --interval=5m --timeout=5s --start-period=30s CMD yarn health-check

13
services/healthcheck.js
View File

@ -4,14 +4,21 @@
* Note that exiting with code 1 indicates failure, and 0 is success * Note that exiting with code 1 indicates failure, and 0 is success
*/ */
const http = require('http'); const isSsl = !!process.env.SSL_PRIV_KEY_PATH && !!process.env.SSL_PUB_KEY_PATH;
const http = require(isSsl ? 'https' : 'http');
/* Location of the server to test */ /* Location of the server to test */
const port = process.env.PORT || !!process.env.IS_DOCKER ? 80 : 4000; const isDocker = !!process.env.IS_DOCKER;
const port = isSsl ? (process.env.SSL_PORT || (isDocker ? 443 : 4001)) : (process.env.PORT || isDocker ? 80 : 4000);
const host = process.env.HOST || '0.0.0.0'; const host = process.env.HOST || '0.0.0.0';
const timeout = 2000; const timeout = 2000;
const requestOptions = { host, port, timeout }; const agent = new http.Agent({
rejectUnauthorized: false, // Allow self-signed certificates
});
const requestOptions = { host, port, timeout, agent };
const startTime = new Date(); // Initialize timestamp to calculate time taken const startTime = new Date(); // Initialize timestamp to calculate time taken