This commit is contained in:
Jonathan Jenne
2023-12-18 11:54:55 +01:00
parent 386ccb7ce4
commit b17e9135bd
9 changed files with 56 additions and 40 deletions

View File

@@ -1,15 +1,6 @@
Imports DigitalData.Modules.Config.ConfigAttributes
Public Class Config
<ConnectionString>
Public Property FirebirdServer As String = ""
<ConnectionString>
Public Property FirebirdDatabase As String = ""
<ConnectionString>
Public Property FirebirdUser As String = ""
<ConnectionString>
Public Property FirebirdPassword As String = ""
<ConnectionString>
Public Property SQLServerConnectionString As String = ""
<ConnectionString>

View File

@@ -59,14 +59,6 @@ Public Class EmailService
_Logger.Info("Inititalize Databases")
If _Config.FirebirdServer <> String.Empty Then
_Firebird = New Firebird(_LogConfig, _Config.FirebirdServer, _Config.FirebirdDatabase, _Config.FirebirdUser, _Config.FirebirdPassword)
If _Firebird._DBInitialized = False Then
_Logger.Warn("Firebird Connection could not be established. Check the Error Log")
End If
End If
If _Config.SQLServerConnectionString <> String.Empty Then
_MSSQL = New MSSQLServer(_LogConfig, _Config.SQLServerConnectionString)
@@ -91,7 +83,6 @@ Public Class EmailService
_Logger.Debug("Inititalize Email")
_limilab = New Limilab(_LogConfig)
_MailSender = New Mail.MailSender(_LogConfig)
' === Initialize Queue ===
@@ -153,11 +144,6 @@ Public Class EmailService
Private Sub EmailQueue_DoWork(sender As Object, e As DoWorkEventArgs)
Try
If _Firebird?._DBInitialized Then
_Logger.Debug("Starting Firebird Sending")
SendEmailFrom(DatabaseType.Firebird, Nothing)
End If
If _MSSQL?.DBInitialized Then
_Logger.Debug("Starting MSSQL Sending")
SendEmailFrom(DatabaseType.MSSQL, _MSSQL)
@@ -345,6 +331,10 @@ Public Class EmailService
_Logger.Debug("Preparing to send [{0}] mails..", oAccountQueue.Count)
' ======= Initialize Sender =======
_MailSender = New Mail.MailSender(_LogConfig)
' ======= Connect to server =======
Dim oOptions As New Mail.MailSession.MailSessionOptions() With {