Skip to content

Commit 77ccdfe

Browse files
authored
Merge pull request #296 from ttsukagoshi/extractStatusLogsMessage
Add process to avoid `messageTriggerLogExtractionIsSet` message from appearing multiple times
2 parents 5585a69 + 7906a4d commit 77ccdfe

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

src/websiteMonitoring.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,11 +670,14 @@ function extractStatusLogs(triggered = false) {
670670
const targetWebsiteUrls = targetWebsitesArr.map((row) => {
671671
let urlIndex = targetWebsitesHeader.indexOf(HEADER_NAME_TARGET_URL);
672672
if (urlIndex < 0) {
673+
// If the header name is not found, throw an error
673674
let errorMessage = localMessage.replaceErrorHeaderNameTargetUrlNotFound(
674675
HEADER_NAME_TARGET_URL,
675676
SHEET_NAME_DASHBOARD,
676677
);
677678
if (triggered === true) {
679+
// If this function is triggered by a time-based trigger,
680+
// delete the trigger to avoid further errors.
678681
ScriptApp.getProjectTriggers().forEach((trigger) => {
679682
if (
680683
ScriptApp.getHandlerFunction() === 'extractStatusLogsTriggered'
@@ -758,9 +761,12 @@ function extractStatusLogs(triggered = false) {
758761
headersArr.forEach((headers) => {
759762
headers.forEach((header, i) => {
760763
if (header !== controlHeader[i]) {
764+
// If the headers do not match, throw an error
761765
let errorMessage =
762766
localMessage.messageList.errorInconsistencyInHeader;
763767
if (triggered === true) {
768+
// If this function is triggered by a time-based trigger,
769+
// delete the trigger to avoid further errors.
764770
ScriptApp.getProjectTriggers().forEach((trigger) => {
765771
if (
766772
ScriptApp.getHandlerFunction() === 'extractStatusLogsTriggered'
@@ -829,6 +835,7 @@ function sendReminder() {
829835
var messageSub = localMessage.messageList.mailSubSendReminderPrefix;
830836
var messageBody = '';
831837
try {
838+
let extractStatusLogsTriggeredExists = false;
832839
let triggerInfo = triggers
833840
.reduce((info, trigger) => {
834841
if (trigger.getHandlerFunction() === 'websiteMonitoringTriggered') {
@@ -853,11 +860,13 @@ function sendReminder() {
853860
.join('\n')}`,
854861
);
855862
} else if (
856-
trigger.getHandlerFunction() === 'extractStatusLogsTriggered'
863+
trigger.getHandlerFunction() === 'extractStatusLogsTriggered' &&
864+
!extractStatusLogsTriggeredExists
857865
) {
858866
info.push(
859867
localMessage.messageList.messageTriggerLogExtractionIsSet,
860868
);
869+
extractStatusLogsTriggeredExists = true;
861870
}
862871
return info;
863872
}, [])

0 commit comments

Comments
 (0)