From 974d55c03c8eff44fa119d04ca774570809a2119 Mon Sep 17 00:00:00 2001
From: Digital Data - Marlon Schreiber <developer01@didalog.de>
Date: Mon, 26 Aug 2019 11:51:45 +0200
Subject: [PATCH] CommunicationService

---
 DD_CommunicationService/MyComService.vb | 38 +++++++++++++++----------
 Modules.Database/MSSQLServer.vb         |  6 ++--
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/DD_CommunicationService/MyComService.vb b/DD_CommunicationService/MyComService.vb
index e5aa6d3c..d6e55905 100644
--- a/DD_CommunicationService/MyComService.vb
+++ b/DD_CommunicationService/MyComService.vb
@@ -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)
diff --git a/Modules.Database/MSSQLServer.vb b/Modules.Database/MSSQLServer.vb
index 139a13f0..2cbee046 100644
--- a/Modules.Database/MSSQLServer.vb
+++ b/Modules.Database/MSSQLServer.vb
@@ -67,7 +67,7 @@ Public Class MSSQLServer
             End Using
         Catch ex As Exception
             _Logger.Error(ex)
-            _Logger.Debug("sqlcommand: " & sqlcommand)
+            _Logger.Warn("sqlcommand: " & sqlcommand)
             Return Nothing
         End Try
     End Function
@@ -99,7 +99,7 @@ Public Class MSSQLServer
             End Using
         Catch ex As Exception
             _Logger.Error(ex)
-            _Logger.Debug("executeStatement: " & SQLCommand)
+            _Logger.Warn("executeStatement: " & SQLCommand)
             Return False
         End Try
     End Function
@@ -159,7 +159,7 @@ Public Class MSSQLServer
             End Using
         Catch ex As Exception
             _Logger.Error(ex)
-            _Logger.Debug("executeStatement: " & executeStatement)
+            _Logger.Warn("executeStatement: " & executeStatement)
         End Try
     End Sub