move try/catch into main control flow and more from code review comments

This commit is contained in:
Humberto Evans 2024-02-13 17:27:59 -08:00
parent 4cdc8f344b
commit 5a9c3ad353
3 changed files with 27 additions and 28 deletions

View file

@ -17,19 +17,24 @@ class HeiiOnCall extends NotificationProvider {
payload["url"] = baseURL + getMonitorRelativeURL(monitorJSON.id); payload["url"] = baseURL + getMonitorRelativeURL(monitorJSON.id);
} }
if (!heartbeatJSON) { try {
// Testing or general notification like certificate expiry if (!heartbeatJSON) {
payload["msg"] = msg; // Testing or general notification like certificate expiry
return this.postNotification(notification, "alert", payload); payload["msg"] = msg;
return this.postNotification(notification, "alert", payload);
}
if (heartbeatJSON.status === DOWN) {
return this.postNotification(notification, "alert", payload);
}
if (heartbeatJSON.status === UP) {
return this.postNotification(notification, "resolve", payload);
}
} catch (error) {
this.throwGeneralAxiosError(error);
} }
if (heartbeatJSON.status === DOWN) {
return this.postNotification(notification, "alert", payload);
}
if (heartbeatJSON.status === UP) {
return this.postNotification(notification, "resolve", payload);
}
} }
/** /**
@ -49,15 +54,11 @@ class HeiiOnCall extends NotificationProvider {
}; };
// Post to Heii On-Call Trigger https://heiioncall.com/docs#manual-triggers // Post to Heii On-Call Trigger https://heiioncall.com/docs#manual-triggers
try { await axios.post(
await axios.post( `https://heiioncall.com/triggers/${notification.heiiOnCallTriggerId}/${action}`,
`https://heiioncall.com/triggers/${notification.heiiOnCallTriggerId}/${action}`, payload,
payload, config
config );
);
} catch (error) {
this.throwGeneralAxiosError(error);
}
return "Sent Successfully"; return "Sent Successfully";
} }

View file

@ -9,7 +9,7 @@
></HiddenInput> ></HiddenInput>
</div> </div>
<div class="mb-3"> <div class="mb-3">
<label for="heiioncall-trigger-id" class="form-label">{{ $t("Trigger ID") }}<span <label for="heiioncall-trigger-id" class="form-label">Trigger ID<span
style="color: red;" style="color: red;"
><sup>*</sup></span></label> ><sup>*</sup></span></label>
<HiddenInput <HiddenInput
@ -17,11 +17,9 @@
autocomplete="false" autocomplete="false"
></HiddenInput> ></HiddenInput>
</div> </div>
<div class="form-text"> <i18n-t tag="p" keypath="wayToGetHeiiOnCallDetails" class="form-text mt-3">
<i18n-t tag="p" keypath="wayToGetHeiiOnCallDetails" style="margin-top: 8px;"> <a href="https://heiioncall.com/docs" target="_blank">{{ $t("documentationOf", ["Heii On-Call"]) }}</a>
<a href="https://heiioncall.com/docs" target="_blank">{{ $t("documentationOf", ["Heii On-Call"]) }}</a> </i18n-t>
</i18n-t>
</div>
</template> </template>
<script> <script>

View file

@ -884,6 +884,6 @@
"GrafanaOncallUrl": "Grafana Oncall URL", "GrafanaOncallUrl": "Grafana Oncall URL",
"Browser Screenshot": "Browser Screenshot", "Browser Screenshot": "Browser Screenshot",
"What is a Remote Browser?": "What is a Remote Browser?", "What is a Remote Browser?": "What is a Remote Browser?",
"Trigger ID": "Trigger ID", "wayToGetHeiiOnCallDetails": "How to get the Tigger ID and API Keys is explained in the {0}",
"wayToGetHeiiOnCallDetails": "How to get the Tigger ID and API Keys is explained in the {documentation}" "documentationOf": "{0} Documentation"
} }