From 1c49054844318ab41ab6cc960320367636e5dbc3 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 30 Mar 2023 15:34:35 +0200 Subject: [PATCH] Add logging --- EDMIAPI/DatabaseWithFallback.vb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/EDMIAPI/DatabaseWithFallback.vb b/EDMIAPI/DatabaseWithFallback.vb index e3177d64..eb7cc3cc 100644 --- a/EDMIAPI/DatabaseWithFallback.vb +++ b/EDMIAPI/DatabaseWithFallback.vb @@ -191,11 +191,13 @@ Public Class DatabaseWithFallback ' If there is no client, we assume there is no service (configured) If _Client Is Nothing Then + _Logger.Debug("Client is empty, falling back to direct database access.") Return GetDatatableFromDatabase(pFallbackSQL, pFallbackType, pConnectionId) End If ' If ForceFallback flag is set, we go to database immediately If pForceFallback Or _ClientConfig.ForceDirectDatabaseAccess Then + _Logger.Debug("ForceFallback is True, falling back to direct database access.") Return GetDatatableFromDatabase(pFallbackSQL, pFallbackType, pConnectionId) End If @@ -332,14 +334,17 @@ Public Class DatabaseWithFallback End Function - Private Function GetDatatableFromDatabase(pSQLCommand As String, DatabaseType As Constants.DatabaseType, pConnectionId As Integer) As DataTable + Private Function GetDatatableFromDatabase(pSQLCommand As String, pDatabaseType As Constants.DatabaseType, pConnectionId As Integer) As DataTable Try - Select Case DatabaseType + _Logger.Debug("Fetching data from database [{0}] with Connection Id [{0}]", pDatabaseType.ToString, pConnectionId) + + Select Case pDatabaseType Case Constants.DatabaseType.IDB Return _DatabaseIDB.GetDatatable(pSQLCommand) Case Else If pConnectionId > 0 Then + _Logger.Debug("Retrieving Connection String from Connection Id [{0}]", pConnectionId) Dim oConnectionString = _DatabaseECM.Get_ConnectionStringforID(pConnectionId) Return _DatabaseECM.GetDatatableWithConnection(pSQLCommand, oConnectionString) Else