mirrors/oneuptime
1
0
Fork 0
mirror of https://github.com/OneUptime/oneuptime synced 2024-11-23 07:42:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix-release'

Browse Source
This commit is contained in:
Nawaz Dhandala 2021-05-14 09:49:46 +01:00
commit e743a49c62
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
probe/workers/apiMonitors.js
View File

@ -92,7 +92,15 @@ const pingfetch = async (url, method, body, headers) => {
*/
response = await fetch(url, { ...payload });
res = new Date().getTime() - now;
data = await response.json();
try {
/* Try getting response json body
If this fails, body is either empty or not valid json
and data should return null
*/
data = await response.json();
} catch (e) {
//
}
if (urlObject.protocol === 'https:') {
const certificate = await sslCert.get(urlObject.hostname);
if (certificate) {
@ -121,7 +129,15 @@ const pingfetch = async (url, method, body, headers) => {
: { agent: httpAgent }),
});
res = new Date().getTime() - now;
data = await response.json();
try {
/* Try getting response json body
If this fails, body is either empty or not valid json
and data should return null
*/
data = await response.json();
} catch (e) {
//
}
if (urlObject.protocol === 'https:') {
const certificate = await sslCert.get(urlObject.hostname);
if (certificate) {