added mona ok status call if no emails in queue to send

This commit is contained in:
Infineon\StieberD 2025-03-19 11:42:32 -07:00 committed by Stieber Daniel (CSC FI SPS MESLEO)
parent 175869df7d
commit 61435345ad

View File

@ -360,37 +360,45 @@ ForwardEMail:
Lock hSysLists, ServiceKeyID then Lock hSysLists, ServiceKeyID then
rv = Set_Status(0) rv = Set_Status(0)
RList('SELECT EMAIL_BOX BY NOTE_KEY', 5, '', '', '') RList('SELECT EMAIL_BOX BY NOTE_KEY', 5, '', '', '')
Done = False$ If @RecCount GT 0 then
LOOP Done = False$
ReadNext eMailBoxKey else Done = True$ Loop
UNTIL Done ReadNext eMailBoxKey else Done = True$
mbParms = 'EMAIL_BOX':@RM:eMailBoxKey Until Done
eMailBoxRec = obj_Tables('ReadRec',mbParms) mbParms = 'EMAIL_BOX':@RM:eMailBoxKey
If @File_Error EQ '' then eMailBoxRec = obj_Tables('ReadRec',mbParms)
eMailAddr = eMailBoxRec<EMAIL_BOX_EMAIL_ADDR$> If @File_Error EQ '' then
eMailText = eMailBoxRec<EMAIL_BOX_EMAIL_TEXT$> eMailAddr = eMailBoxRec<EMAIL_BOX_EMAIL_ADDR$>
eMailHeader = eMailBoxRec<EMAIL_BOX_EMAIL_HEADER$> eMailText = eMailBoxRec<EMAIL_BOX_EMAIL_TEXT$>
OISentFrom = eMailBoxRec<EMAIL_BOX_FROM_USER$> eMailHeader = eMailBoxRec<EMAIL_BOX_EMAIL_HEADER$>
SentFrom = 'oinotify@infineon.com' OISentFrom = eMailBoxRec<EMAIL_BOX_FROM_USER$>
SendTo = eMailAddr SentFrom = 'oinotify@infineon.com'
IF OISentFrom = 'OI_ERROR' THEN SendTo := XLATE('SEC_GROUPS', 'OI_ADMIN', 'USER', 'X') SendTo = eMailAddr
Success = Email_Services('SendEmail', SentFrom, SendTo, eMailHeader, eMailText) IF OISentFrom = 'OI_ERROR' THEN SendTo := XLATE('SEC_GROUPS', 'OI_ADMIN', 'USER', 'X')
If Success then Success = Email_Services('SendEmail', SentFrom, SendTo, eMailHeader, eMailText)
LogData = '' If Success then
LogData<1> = LoggingDtm LogData = ''
LogData<2> = 'Successfully sent email From: ':SentFrom:' To: ':SendTo:' Header: ':eMailHeader:' Body: ':eMailText LogData<1> = LoggingDtm
Logging_Services('AppendLog', objLog, LogData, @RM, @FM) LogData<2> = 'Successfully sent email From: ':SentFrom:' To: ':SendTo:' Header: ':eMailHeader:' Body: ':eMailText
Mona_Services('SendBufferedStatus', 'OPENINSIGHT_MES_OP_FE', 'Email-Service', 'ok') Logging_Services('AppendLog', objLog, LogData, @RM, @FM)
end else Mona_Services('SendBufferedStatus', 'OPENINSIGHT_MES_OP_FE', 'Email-Service', 'ok')
LogData = '' end else
LogData<1> = LoggingDtm LogData = ''
LogData<2> = 'Failed to send email From: ':SentFrom:' To: ':SendTo:' Header: ':eMailHeader:' Body: ':eMailText:' Error message: ':Error_Services('GetMessage') LogData<1> = LoggingDtm
Logging_Services('AppendLog', objLog, LogData, @RM, @FM) LogData<2> = 'Failed to send email From: ':SentFrom:' To: ':SendTo:' Header: ':eMailHeader:' Body: ':eMailText:' Error message: ':Error_Services('GetMessage')
Mona_Services('SendBufferedStatus', 'OPENINSIGHT_MES_OP_FE', 'Email-Service', 'critical') Logging_Services('AppendLog', objLog, LogData, @RM, @FM)
end Mona_Services('SendBufferedStatus', 'OPENINSIGHT_MES_OP_FE', 'Email-Service', 'critical')
obj_Tables('DeleteRec',mbParms) end
end obj_Tables('DeleteRec',mbParms)
REPEAT end
Repeat
end else
LogData = ''
LogData<1> = LoggingDtm
LogData<2> = 'No emails to send...'
Logging_Services('AppendLog', objLog, LogData, @RM, @FM)
Mona_Services('SendBufferedStatus', 'OPENINSIGHT_MES_OP_FE', 'Email-Service', 'ok')
end
Unlock hSysLists, ServiceKeyID else Null Unlock hSysLists, ServiceKeyID else Null
end end