Email Service Logging

DocumentViewer Debug
This commit is contained in:
Developer01
2025-06-24 14:39:24 +02:00
parent 245192eed9
commit 4fdab8d417
6 changed files with 274 additions and 78 deletions

View File

@@ -275,10 +275,10 @@ Public Class EmailService
End Try
End Function
Private Function SendEmailFrom(Database As DatabaseType, MSSQLInstance As MSSQLServer)
Private Function SendEmailFrom(pDatabase As DatabaseType, pMSSQLInstance As MSSQLServer)
Try
Dim oSQL As String = String.Empty
Dim oEmailAccounts As List(Of EmailAccount) = GetAccounts(Database, MSSQLInstance)
Dim oEmailAccounts As List(Of EmailAccount) = GetAccounts(pDatabase, pMSSQLInstance)
Dim oEmailQueue As DataTable = Nothing
If IsNothing(oEmailAccounts) Then
@@ -291,7 +291,7 @@ Public Class EmailService
Return False
End If
Select Case Database
Select Case pDatabase
Case DatabaseType.Firebird
oSQL = "SELECT * FROM TBEDM_EMAIL_QUEUE WHERE EMAIL_SENT IS NULL and EMAIL_TO <> ''"
oEmailQueue = _Firebird.GetDatatable(oSQL)
@@ -300,10 +300,10 @@ Public Class EmailService
_Logger.Debug("My.Settings.MSSQL_SELECT will be used..")
oSQL = My.Settings.MSSQL_SELECT
Else
oSQL = "SELECT * FROM TBEMLP_EMAIL_OUT WHERE EMAIL_SENT IS NULL and EMAIL_ADRESS <> ''"
oSQL = "SELECT * FROM TBEMLP_EMAIL_OUT WHERE EMAIL_SENT IS NULL and EMAIL_ADRESS <> '' ORDER BY GUID"
End If
oEmailQueue = MSSQLInstance.GetDatatable(oSQL)
oEmailQueue = pMSSQLInstance.GetDatatable(oSQL)
End Select
If IsNothing(oEmailQueue) Then
@@ -326,7 +326,7 @@ Public Class EmailService
Dim oAccountQueue As DataRow()
Select Case Database
Select Case pDatabase
Case DatabaseType.Firebird
oAccountQueue = oEmailQueue.Select($"EMAIL_ACCOUNT_ID = {oAccount.Guid}", "GUID ASC")
Case Else
@@ -339,7 +339,7 @@ Public Class EmailService
Continue For
End If
_Logger.Debug("Preparing to send [{0}] mails..", oAccountQueue.Count)
_Logger.Info("Preparing to send [{0}] mails for Email-Account [{1}]", oAccountQueue.Count, oAccount.Guid)
' ======= Initialize Sender =======
@@ -379,7 +379,7 @@ Public Class EmailService
Dim ATT1_RELATED_ID = String.Empty
Dim ATT1_REL_TYPE = String.Empty
Select Case Database
Select Case pDatabase
Case DatabaseType.Firebird
oGuid = oRow.Item("GUID")
@@ -421,7 +421,7 @@ Public Class EmailService
If ATT1_RELATED_ID <> String.Empty And ATT1_REL_TYPE <> String.Empty Then
_Logger.Info($"Attachment via byte/ID [{ATT1_RELATED_ID}]...")
If ATT1_REL_TYPE = "EnvelopeResult" Then
GetEnvelope_Result_FileStreamByte(ATT1_RELATED_ID, MSSQLInstance)
GetEnvelope_Result_FileStreamByte(ATT1_RELATED_ID, pMSSQLInstance)
End If
If IsNothing(_AttachmentByteData) = False Then
Dim oTempFolder = _TempFiles.TempPath
@@ -455,13 +455,13 @@ Public Class EmailService
oTotalSent.Add(oEmailTo)
oSuccessfulSent.Add(oEmailTo)
Select Case Database
Select Case pDatabase
Case DatabaseType.Firebird
oSQL = GetFirebirdUpdateString(oComment, oGuid)
_Firebird.ExecuteNonQuery(oSQL)
Case DatabaseType.MSSQL
oSQL = GetSQLUpdateString(oComment, oGuid)
MSSQLInstance.ExecuteNonQuery(oSQL)
pMSSQLInstance.ExecuteNonQuery(oSQL)
End Select
_Logger.Info($"EmailID [{oGuid.ToString}] has been send to: {oEmailTo}")
@@ -469,7 +469,7 @@ Public Class EmailService
oTotalSent.Add(oEmailTo)
oFailedSent.Add(oEmailTo)
Select Case Database
Select Case pDatabase
Case DatabaseType.MSSQL
Dim oErrorMessage As String
If String.IsNullOrEmpty(_limilab.ErrorMessage) = False Then
@@ -478,7 +478,7 @@ Public Class EmailService
oErrorMessage = $"Could not sent email to email adress. Check log!"
End If
oSQL = $"UPDATE TBEMLP_EMAIL_OUT SET EMAIL_SENT = GETDATE(), ERROR_TIMESTAMP = GETDATE(), ERROR_MSG = '{oErrorMessage}' WHERE GUID = {oGuid} "
MSSQLInstance.ExecuteNonQuery(oSQL)
pMSSQLInstance.ExecuteNonQuery(oSQL)
End Select
End If

View File

@@ -32,4 +32,4 @@ Imports System.Runtime.InteropServices
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.7.3.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: AssemblyFileVersion("1.7.3.0")>