Verbesserungen: Thread-Sicherheit, Logging, WCF-Updates

Die Änderungen umfassen: - Einführung von `ReaderWriterLockSlim` für Thread-Sicherheit. - Optimierung von `IsOnline` mit atomaren Operationen. - Verbesserte Reconnect-Logik und Fehlerbehandlung. - Neue Methoden für Datenbankoperationen (`GetDatatableByName` etc.). - Gemeinsame `ChannelFactory` zur Ressourcenschonung. - Logging-Verbesserungen mit präziseren Meldungen und Symbolen. - Aktualisierte WCF-Bindings für höhere Verbindungszahlen und kürzere Timeouts. - Aktualisierte Service-Referenzen mit asynchronen Methoden. - Bereinigung von veralteten Methoden und Eigenschaften. - Assembly-Version auf `2.8.0.0` aktualisiert.
2026-10-13 12:06:50 +02:00
parent aad2f01490
commit 3eb6314ba8
9 changed files with 4244 additions and 659 deletions
--- a/EDMIAPI/DatabaseWithFallback.vb
+++ b/EDMIAPI/DatabaseWithFallback.vb
@@ -342,14 +342,17 @@ Public Class DatabaseWithFallback
    End Function

    Private Async Function GetDatatableFromServiceAsync(pSQLCommand As String, DatabaseType As Constants.DatabaseType, pConnectionId As Integer) As Task(Of DataTable)
-        Dim oFallback As Boolean = False
-        _Logger.Debug("GetDatatableFromServiceAsync: GetDatatableFromServiceAsync called with SQL [{0}], DatabaseType [{1}], ConnectionId [{2}]", pSQLCommand, DatabaseType.ToString, pConnectionId)
+        _Logger.Debug("GetDatatableFromServiceAsync called | SQL=[{0}] | DB=[{1}] | ConnId=[{2}]",
+                      pSQLCommand, DatabaseType.ToString, pConnectionId)
+
        If _Client Is Nothing OrElse _ClientConfig?.ForceDirectDatabaseAccess Then
-            Return Await Task.Run(Function() GetDatatableFromDatabase(pSQLCommand, DatabaseType, pConnectionId))
+            ' ← Kein Task.Run: direkt synchron, Thread ist ohnehin frei
+            Return GetDatatableFromDatabase(pSQLCommand, DatabaseType, pConnectionId)
        End If

-        Dim oResult As GetDatatableResponse = Nothing
        Try
+            Dim oResult As GetDatatableResponse = Nothing
+
            Select Case DatabaseType
                Case Constants.DatabaseType.ECM
                    oResult = Await _Client.GetDatatableFromECMAsync(pSQLCommand)
@@ -360,20 +363,22 @@ Public Class DatabaseWithFallback
            End Select

            If oResult Is Nothing OrElse oResult.OK = False Then
-                _Logger.Warn("⚠ GetDatatableFromServiceAsync failed. Falling back to direct database access.")
-                oFallback = True
+                _Logger.Warn("⚠ GetDatatableFromServiceAsync failed | Fallback to DB | Error=[{0}]",
+                             If(oResult Is Nothing, "null", oResult.ErrorMessage))
+                Return GetDatatableFromDatabase(pSQLCommand, DatabaseType, pConnectionId)
            End If
+
+            Return oResult.Table
+
+        Catch ex As InvalidOperationException
+            _Logger.Warn("⚠ GetDatatableFromServiceAsync offline: [{0}] | Fallback to DB", ex.Message)
+            Return GetDatatableFromDatabase(pSQLCommand, DatabaseType, pConnectionId)
+
        Catch ex As Exception
-            _Logger.Warn("⚠ GetDatatableFromServiceAsync failed. Falling back to direct database access.")
+            _Logger.Warn("⚠ GetDatatableFromServiceAsync failed | Fallback to DB")
            _Logger.Error(ex)
-            oFallback = True
+            Return GetDatatableFromDatabase(pSQLCommand, DatabaseType, pConnectionId)
        End Try
-
-        If oFallback Then
-            Return Await Task.Run(Function() GetDatatableFromDatabase(pSQLCommand, DatabaseType, pConnectionId))
-        End If
-
-        Return oResult.Table
    End Function
    Private Function GetDatatableFromDatabase(pSQLCommand As String, pDatabaseType As Constants.DatabaseType, pConnectionId As Integer) As DataTable
        Try
@@ -401,16 +406,16 @@ Public Class DatabaseWithFallback
        End Try
    End Function
    Private Async Function GetScalarValueFromServiceAsync(pSQLCommand As String, DatabaseType As Constants.DatabaseType, pConnectionId As Integer) As Task(Of Object)
-        Dim oFallback As Boolean = False
-
-        _Logger.Debug("GetScalarValueFromServiceAsync called with SQL [{0}], DatabaseType [{1}], ConnectionId [{2}]", pSQLCommand, DatabaseType.ToString, pConnectionId)
+        _Logger.Debug("GetScalarValueFromServiceAsync called | SQL=[{0}] | DB=[{1}] | ConnId=[{2}]",
+                      pSQLCommand, DatabaseType.ToString, pConnectionId)

        If _Client Is Nothing OrElse _ClientConfig?.ForceDirectDatabaseAccess Then
-            Return Await Task.Run(Function() GetScalarValueFromDatabase(pSQLCommand, DatabaseType, pConnectionId))
+            Return GetScalarValueFromDatabase(pSQLCommand, DatabaseType, pConnectionId) ' ← kein Task.Run
        End If

-        Dim oResult As GetScalarValueResponse = Nothing
        Try
+            Dim oResult As GetScalarValueResponse = Nothing
+
            Select Case DatabaseType
                Case Constants.DatabaseType.ECM
                    oResult = Await _Client.GetScalarValueFromECMAsync(pSQLCommand)
@@ -421,20 +426,21 @@ Public Class DatabaseWithFallback
            End Select

            If oResult Is Nothing OrElse oResult.OK = False Then
-                _Logger.Warn("⚠ GetScalarValueFromServiceAsync failed. Falling back to direct database access.")
-                oFallback = True
+                _Logger.Warn("⚠ GetScalarValueFromServiceAsync failed | Fallback to DB")
+                Return GetScalarValueFromDatabase(pSQLCommand, DatabaseType, pConnectionId)
            End If
+
+            Return oResult.Scalar
+
+        Catch ex As InvalidOperationException
+            _Logger.Warn("⚠ GetScalarValueFromServiceAsync offline: [{0}] | Fallback to DB", ex.Message)
+            Return GetScalarValueFromDatabase(pSQLCommand, DatabaseType, pConnectionId)
+
        Catch ex As Exception
-            _Logger.Warn("⚠ GetScalarValueFromServiceAsync failed. Falling back to direct database access.")
+            _Logger.Warn("⚠ GetScalarValueFromServiceAsync failed | Fallback to DB")
            _Logger.Error(ex)
-            oFallback = True
+            Return GetScalarValueFromDatabase(pSQLCommand, DatabaseType, pConnectionId)
        End Try
-
-        If oFallback Then
-            Return Await Task.Run(Function() GetScalarValueFromDatabase(pSQLCommand, DatabaseType, pConnectionId))
-        End If
-
-        Return oResult.Scalar
    End Function
    Private Function GetScalarValueFromService(pSQLCommand As String, DatabaseType As Constants.DatabaseType, pConnectionId As Integer) As Object
        Try
@@ -493,16 +499,16 @@ Public Class DatabaseWithFallback
        End Try
    End Function
    Private Async Function ExecuteNonQueryFromServiceAsync(pSQLCommand As String, DatabaseType As Constants.DatabaseType, pConnectionId As Integer) As Task(Of Boolean)
-        Dim oFallback As Boolean = False
-
-        _Logger.Debug("ExecuteNonQueryFromServiceAsync called with SQL [{0}], DatabaseType [{1}], ConnectionId [{2}]", pSQLCommand, DatabaseType.ToString, pConnectionId)
+        _Logger.Debug("ExecuteNonQueryFromServiceAsync called | SQL=[{0}] | DB=[{1}] | ConnId=[{2}]",
+                      pSQLCommand, DatabaseType.ToString, pConnectionId)

        If _Client Is Nothing OrElse _ClientConfig?.ForceDirectDatabaseAccess Then
-            Return Await Task.Run(Function() ExecuteNonQueryFromDatabase(pSQLCommand, DatabaseType, pConnectionId))
+            Return ExecuteNonQueryFromDatabase(pSQLCommand, DatabaseType, pConnectionId) ' ← kein Task.Run
        End If

-        Dim oResult As ExecuteNonQueryResponse = Nothing
        Try
+            Dim oResult As ExecuteNonQueryResponse = Nothing
+
            Select Case DatabaseType
                Case Constants.DatabaseType.ECM
                    oResult = Await _Client.ExecuteNonQueryFromECMAsync(pSQLCommand)
@@ -513,20 +519,21 @@ Public Class DatabaseWithFallback
            End Select

            If oResult Is Nothing OrElse oResult.OK = False Then
-                _Logger.Warn("⚠ ExecuteNonQueryFromServiceAsync failed. Falling back to direct database access.")
-                oFallback = True
+                _Logger.Warn("⚠ ExecuteNonQueryFromServiceAsync failed | Fallback to DB")
+                Return ExecuteNonQueryFromDatabase(pSQLCommand, DatabaseType, pConnectionId)
            End If
+
+            Return oResult.Result
+
+        Catch ex As InvalidOperationException
+            _Logger.Warn("⚠ ExecuteNonQueryFromServiceAsync offline: [{0}] | Fallback to DB", ex.Message)
+            Return ExecuteNonQueryFromDatabase(pSQLCommand, DatabaseType, pConnectionId)
+
        Catch ex As Exception
-            _Logger.Warn("⚠ ExecuteNonQueryFromServiceAsync failed. Falling back to direct database access.")
+            _Logger.Warn("⚠ ExecuteNonQueryFromServiceAsync failed | Fallback to DB")
            _Logger.Error(ex)
-            oFallback = True
+            Return ExecuteNonQueryFromDatabase(pSQLCommand, DatabaseType, pConnectionId)
        End Try
-
-        If oFallback Then
-            Return Await Task.Run(Function() ExecuteNonQueryFromDatabase(pSQLCommand, DatabaseType, pConnectionId))
-        End If
-
-        Return oResult.Result
    End Function
    Private Function ExecuteNonQueryFromService(pSQLCommand As String, DatabaseType As Constants.DatabaseType, pConnectionId As Integer) As Boolean
        Try