AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Jonathan Jenne 2019-08-29 11:14:36 +02:00
commit 718c77ccdd
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
DD_CommunicationService/MyComService.vb
View File

@ -24,11 +24,16 @@ Public Class MyComService
End If
myLogger = MyLoConfig.GetLogger()
_firebird = New Firebird(MyLoConfig, My.Settings.FB_ConnString, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW)
If My.Settings.FB_ConnString <> String.Empty Then
_firebird = New Firebird(MyLoConfig, My.Settings.FB_ConnString, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW)
End If
_Email = New Email(MyLoConfig)
_EmailAlt = New clsEmail(MyLoConfig)
_MSSQL = New MSSQLServer(MyLoConfig, My.Settings.SQLSERVER_CS)
If _firebird._DBInitialized = True Then
If My.Settings.SQLSERVER_CS <> String.Empty Then
_MSSQL = New MSSQLServer(MyLoConfig, My.Settings.SQLSERVER_CS)
End If
If (_firebird._DBInitialized = True Or _MSSQL.DBInitialized = True) Then
MyComService.threadEmailQueue = New BackgroundWorker()
MyComService.threadEmailQueue.WorkerReportsProgress = True
MyComService.threadEmailQueue.WorkerSupportsCancellation = True
@ -78,14 +83,22 @@ Public Class MyComService
MyLoConfig.Debug = False
End If
_Email = New Email(MyLoConfig)
_firebird = New Firebird(MyLoConfig, My.Settings.FB_ConnString, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW)
If _firebird._DBInitialized = False Then
myLogger.Warn("Firebird-DB could not be intitialized!")
Exit Sub
If My.Settings.FB_ConnString <> String.Empty Then
_firebird = New Firebird(MyLoConfig, My.Settings.FB_ConnString, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW)
If _firebird._DBInitialized = False Then
myLogger.Warn("Firebird-DB could not be intitialized!")
Exit Sub
End If
SEND_FROM_FBDB()
End If
If My.Settings.SQLSERVER_CS <> String.Empty Then
_MSSQL = New MSSQLServer(MyLoConfig, My.Settings.SQLSERVER_CS)
If _MSSQL.DBInitialized = False Then
myLogger.Warn("SQL-DB could not be intitialized!")
Exit Sub
End If
SEND_FROM_MSSQL()
End If
SEND_FROM_FBDB()
SEND_FROM_MSSQL()
Catch ex As Exception
myLogger.Error(ex)
End Try
@ -269,9 +282,6 @@ Public Class MyComService
myLogger.Debug($"oJOB_ID: {oJOB_ID}")
oAttachment = oEmail_Row.Item("EMAIL_ATTMT1")
Try
myLogger.Debug($"Now checking the attachment")
If IsDBNull(oAttachment) Then
@ -296,7 +306,6 @@ Public Class MyComService
oSendResult = _EmailAlt.Email_Send_Independentsoft(oSubject, oBody, oEmailTo, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, oAttachment)
If oSendResult = False Then
oSendResult = _Email.NewEmail(oEmailTo, oSubject, oBody, oMailFrom, oMailSMTP, oMailport, oMailUser, oMailPW, oAuthType, "DDEDMI_ComService", oAttachment.ToString)
End If
If oSendResult = True Then
Dim oUpdCommand = "UPDATE TBEMLP_EMAIL_OUT SET EMAIL_SENT = GETDATE() WHERE GUID = " & oGUID
@ -309,7 +318,6 @@ Public Class MyComService
ElseIf IsNothing(oDT_EMAIL_QUEUE) Then
myLogger.Warn($"DT_EMAIL_QUEUE is nothing: {oSQL}")
End If
End If
Catch ex As Exception
myLogger.Error(ex)