From 152b5157b88e1364e8df710b48253b16cf95eec4 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 9 Aug 2021 13:27:27 +0200 Subject: [PATCH] improve logging --- App/DigitalData.EMLProfiler/clsDatabase.vb | 18 ++++++++++++------ App/DigitalData.EMLProfiler/clsEmail.IMAP.vb | 13 ++++++++++++- App/DigitalData.EMLProfiler/clsEmail.vb | 12 ++++++++++++ App/DigitalData.EMLProfiler/clsEncryption.vb | 1 + App/DigitalData.EMLProfiler/clsWorkEmail.vb | 11 ++++++++++- App/DigitalData.EMLProfiler/clsWorker.vb | 2 ++ 6 files changed, 49 insertions(+), 8 deletions(-) diff --git a/App/DigitalData.EMLProfiler/clsDatabase.vb b/App/DigitalData.EMLProfiler/clsDatabase.vb index 5121ff2..8677b56 100644 --- a/App/DigitalData.EMLProfiler/clsDatabase.vb +++ b/App/DigitalData.EMLProfiler/clsDatabase.vb @@ -38,7 +38,8 @@ Public Class clsDatabase Logger.Debug("Database initialized") Return True Catch ex As Exception - Logger.Error("Unexpected Error in DatabaseInit: " & ex.Message) + Logger.Error(ex) + Logger.Warn("Unexpected Error in DatabaseInit: " & ex.Message) Return False End Try End Function @@ -61,7 +62,8 @@ Public Class clsDatabase SQLconnect.Close() Return dt Catch ex As Exception - Logger.Error("Unexpected Error in Return_Datatable: " & ex.Message) + Logger.Error(ex) + Logger.Warn("Unexpected Error in Return_Datatable: " & ex.Message) Logger.Warn("SQL: " & Select_anweisung) Return Nothing End Try @@ -83,7 +85,8 @@ Public Class clsDatabase SQLconnect.Close() Return dt Catch ex As Exception - Logger.Error("Unexpected Error in Return_DatatableCS: " & ex.Message) + Logger.Error(ex) + Logger.Warn("Unexpected Error in Return_DatatableCS: " & ex.Message) Logger.Warn("SQL: " & Select_anweisung) Return Nothing End Try @@ -102,7 +105,8 @@ Public Class clsDatabase SQLconnect.Close() Return True Catch ex As Exception - Logger.Error("Unexpected Error in Execute_non_Query: " & ex.Message) + Logger.Error(ex) + Logger.Warn("Unexpected Error in Execute_non_Query: " & ex.Message) Logger.Warn("SQL: " & ExecuteCMD) Return False End Try @@ -122,7 +126,8 @@ Public Class clsDatabase SQLconnect.Close() Return result Catch ex As Exception - Logger.Error("Unexpected Error Execute_Scalar: " & ex.Message) + Logger.Error(ex) + Logger.Warn("Unexpected Error in Execute_Scalar: " & ex.Message) Logger.Warn("SQL: " & cmdscalar) Return Nothing End Try @@ -142,7 +147,8 @@ Public Class clsDatabase SQLconnect.Close() Return result Catch ex As Exception - Logger.Error("Unexpected Error Execute_Scalar_CS: " & ex.Message) + Logger.Error(ex) + Logger.Warn("Unexpected Error in Execute_Scalar_CS: " & ex.Message) Logger.Warn("SQL: " & cmdscalar) Return Nothing End Try diff --git a/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb b/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb index 41e65ad..e428f12 100644 --- a/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb +++ b/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb @@ -57,6 +57,7 @@ Public Class clsEmailIMAP oLastLog &= " # Extracting the MessageID" oMessageREFGUID = oMsg.MessageID Catch ex As Exception + Logger.Error(ex) Logger.Warn($"FetchIMAPMessagesS22 - Could not get a MessageID or create a MailObject - Error: {ex.Message} - Last Debug Log: [{oLastLog}]") Continue For End Try @@ -92,6 +93,7 @@ Public Class clsEmailIMAP Logger.Debug($"FetchIMAPMessagesS22 - Message has been deleted!") End If Catch ex As Exception + Logger.Error(ex) Logger.Warn("Message could not be deleted: " & ex.Message) End Try If MoveMailTo <> String.Empty Then @@ -100,6 +102,7 @@ Public Class clsEmailIMAP oClient.MoveMessage(oMessageId, MoveMailTo) Logger.Debug($"FetchIMAPMessagesS22 - successfully moved!") Catch ex As Exception + Logger.Error(ex) Logger.Warn($"FetchIMAPMessagesS22 - Could not move message to folder [{MoveMailTo}] - Error: {ex.Message}") End Try End If @@ -116,6 +119,7 @@ Public Class clsEmailIMAP End Try Catch ex As Exception + Logger.Error(ex) Logger.Warn($"FetchIMAPMessages - Unexpected Error while working on email: [{ex.Message}] - Last Debug Log: [{oLastLog}]") End Try @@ -171,6 +175,7 @@ Public Class clsEmailIMAP Try oClient.Connect() Catch ex As Exception + Logger.Error(ex) Logger.Warn("Error while oClient.Connec(): " & ex.Message) Return False End Try @@ -230,6 +235,7 @@ Public Class clsEmailIMAP Dim oUpd = $"UPDATE TBEMLP_HISTORY SET DATE_DELETED_INBOX = GETDATE(), COMMENT = 'DELETED MESSAGE FROM INBOX (2ndRun ALREADY WORKED)' WHERE lower(EMAIL_MSGID) = lower('{oMessageID}')" _DB_MSSQL.Execute_non_Query(oUpd) Catch ex As Exception + Logger.Error(ex) Logger.Warn($"Error deleting/Commenting message due to to already worked: {ex.Message}") End Try @@ -240,6 +246,7 @@ Public Class clsEmailIMAP Try oClient.AddMessage(MoveMailTo, oMimeMessage) Catch ex As Exception + Logger.Error(ex) Logger.Warn($"Isoft: Could not move message to folder [{MoveMailTo}] - Error: {ex.Message}") End Try End If @@ -283,6 +290,7 @@ Public Class clsEmailIMAP Logger.Debug("Isoft: IMAP COLLECT Independentsoft finished!") Return True Catch ex As Exception + Logger.Error(ex) Logger.Error(ex, "Unexpected Error in IMAP COLLECT Independentsoft:") Return False End Try @@ -303,6 +311,7 @@ Public Class clsEmailIMAP Try oClient.Login(Username, Password, AuthenticationType.Login) Catch ex As Exception + Logger.Error(ex) Logger.Warn("Error while loginImap.now trying Ntlm-Auth: " & ex.Message) Try oClient.Login(Username, Password, AuthenticationType.Ntlm) @@ -346,7 +355,8 @@ Public Class clsEmailIMAP Logger.Debug("IMAP_Set2Seen finished!") Return True Catch ex As Exception - Logger.Error(ex, "Unexpected Error in IMAP_Set2Seen Independentsoft:") + Logger.Warn("Unexpected Error in IMAP_Set2Seen Independentsoft") + Logger.Error(ex) Return False End Try End Function @@ -371,6 +381,7 @@ Public Class clsEmailIMAP Return True Catch ex As Exception + Logger.Error(ex) Return Nothing End Try End Function diff --git a/App/DigitalData.EMLProfiler/clsEmail.vb b/App/DigitalData.EMLProfiler/clsEmail.vb index 09ee612..917f97b 100644 --- a/App/DigitalData.EMLProfiler/clsEmail.vb +++ b/App/DigitalData.EMLProfiler/clsEmail.vb @@ -123,6 +123,7 @@ Public Class clsEmail End Using Catch ex As Exception + Logger.Error(ex) Logger.Warn("Error while deleting s22Mail: " & ex.Message) Return False End Try @@ -136,6 +137,7 @@ Public Class clsEmail Try oIMAPClient.Login(MAIL_USER, MAIL_USER_PW, AuthenticationType.Login) Catch ex As Exception + Logger.Error(ex) Logger.Warn("Error while loginImap.now trying Ntlm-Auth: " & ex.Message) Try oIMAPClient.Login(MAIL_USER, MAIL_USER_PW, AuthenticationType.Ntlm) @@ -170,6 +172,7 @@ Public Class clsEmail Catch ex As Exception + Logger.Error(ex) Logger.Warn("Error in IMAP Delete: " & ex.Message) Return False End Try @@ -234,6 +237,7 @@ Public Class clsEmail Try client = New SmtpClient(mailsmtp, mailport) Catch ex As Exception + Logger.Error(ex) Logger.Warn("clsEmail.Create Client: " & ex.Message) _error = True Continue For @@ -241,6 +245,7 @@ Public Class clsEmail Try client.Connect() Catch ex As Exception + Logger.Error(ex) Logger.Warn("clsEmail.Client.Connect1: " & ex.Message) Logger.Debug("Error in ClientConnect - but still trying to send") _error = True @@ -264,6 +269,7 @@ Public Class clsEmail client.Connect() Catch ex As Exception + Logger.Error(ex) Logger.Warn("clsEmail.Client.Connect: " & ex.Message) _error = True ' Continue For @@ -277,6 +283,8 @@ Public Class clsEmail Logger.Debug("Logged in!") Catch ex As Exception + Logger.Error(ex) + Try If mailsmtp.Contains("office365.com") Then client.Login(mailUser, mailPW, AuthenticationType.Login) @@ -285,9 +293,12 @@ Public Class clsEmail End If Catch ex1 As Exception + Logger.Error(ex) + Try client.Login(mailUser, mailPW, AuthenticationType.Login) Catch ex2 As Exception + Logger.Error(ex) Logger.Warn("clsEmail.Client.Login: " & ex.Message) _error = True client.Disconnect() @@ -300,6 +311,7 @@ Public Class clsEmail Logger.Info("Message to " & _mailempfaenger & " has been send.") _error = False Catch ex As Exception + Logger.Error(ex) Logger.Warn("clsEmail.Client.Send: " & ex.Message) _error = True client.Disconnect() diff --git a/App/DigitalData.EMLProfiler/clsEncryption.vb b/App/DigitalData.EMLProfiler/clsEncryption.vb index 4ca1f1d..9502a2d 100644 --- a/App/DigitalData.EMLProfiler/clsEncryption.vb +++ b/App/DigitalData.EMLProfiler/clsEncryption.vb @@ -69,6 +69,7 @@ Public Class clsEncryption ' Convert the plaintext stream to a string. Return result Catch ex As Exception + Logger.Error(ex) Return Nothing End Try diff --git a/App/DigitalData.EMLProfiler/clsWorkEmail.vb b/App/DigitalData.EMLProfiler/clsWorkEmail.vb index d0c8e7d..1542b6d 100644 --- a/App/DigitalData.EMLProfiler/clsWorkEmail.vb +++ b/App/DigitalData.EMLProfiler/clsWorkEmail.vb @@ -65,6 +65,7 @@ Public Class clsWorkEmail Dim oFS As FileStream = File.OpenRead(CURRENT_TEMP_MAIL_PATH) oTempMailAccessible = True Catch ex As Exception + Logger.Error(ex) Logger.Warn($"Could not read the Temp-Mail. Insufficient rights? Message: {ex.Message}") End Try If oTempMailAccessible = True Then @@ -109,6 +110,7 @@ Public Class clsWorkEmail Try WM_REFERENCE_INDEX = row("WM_REFERENCE_INDEX") Catch ex As Exception + Logger.Error(ex) Logger.Debug($"PM_IN Attention WM_REFERENCE_INDEX seems to be Empty/null: {ex.Message}") WM_REFERENCE_INDEX = Nothing End Try @@ -174,12 +176,14 @@ Public Class clsWorkEmail Try WM_REFERENCE_INDEX = oDataRow("WM_REFERENCE_INDEX") Catch ex As Exception + Logger.Error(ex) Logger.Debug($"Attention WM_REFERENCE_INDEX seems to be Empty/null: {ex.Message}") WM_REFERENCE_INDEX = Nothing End Try Try WM_VECTOR_LOG = oDataRow("WM_VECTOR_LOG") Catch ex As Exception + Logger.Error(ex) WM_VECTOR_LOG = Nothing End Try @@ -226,6 +230,7 @@ Public Class clsWorkEmail Try File.Delete(oFileName) Catch ex As Exception + Logger.Error(ex) End Try Next oFileName @@ -309,7 +314,7 @@ Public Class clsWorkEmail End If Else - Logger.Info("COPY2HDD - EMail (" & CURRENT_MAIL_MESSAGE.Subject & ") already existing!", False, "RUN_THREAD.COPY_2_HDD") + Logger.Warn("COPY2HDD - EMail (" & CURRENT_MAIL_MESSAGE.Subject & ") already existing!", False, "RUN_THREAD.COPY_2_HDD") Return False End If End If @@ -377,6 +382,7 @@ Public Class clsWorkEmail Try oPattern2 = oDTFunctionRegex.Rows(1).Item("REGEX") Catch ex As Exception + Logger.Error(ex) oPattern2 = "" End Try @@ -561,6 +567,7 @@ Public Class clsWorkEmail End If Catch ex As Exception + Logger.Error(ex) Logger.Warn($"Error while saving attachment-name: {ex.Message} - AttachmentName: {oAttachmentFileString}") MessageError = True End Try @@ -569,6 +576,7 @@ Public Class clsWorkEmail End If Catch ex As Exception + Logger.Error(ex) Logger.Warn($"Error while creating and saving attachment-name: {ex.Message} - AttachmentName: {oAttachmentFileString}") MessageError = True Return False @@ -849,6 +857,7 @@ Public Class clsWorkEmail CURRENT_WM_DOC = oWMDOC Return True Catch ex As Exception + Logger.Error(ex) Logger.Warn("error while creating WMObject in (GET_DOC_INFO): " & ex.Message) Logger.Warn("oWMNormpath: " & oWMNormpath) Return False diff --git a/App/DigitalData.EMLProfiler/clsWorker.vb b/App/DigitalData.EMLProfiler/clsWorker.vb index bc0ccfc..84182c2 100644 --- a/App/DigitalData.EMLProfiler/clsWorker.vb +++ b/App/DigitalData.EMLProfiler/clsWorker.vb @@ -159,6 +159,7 @@ Public Class clsWorker CURRENT_MAIL_MESSAGE = Nothing Next Catch ex As Exception + Logger.Error(ex) Logger.Warn($"Error converting CURRENT_WORKMAIL_LIST to IsoftMesage: {ex.Message} ") End Try @@ -181,6 +182,7 @@ Public Class clsWorker Try System.IO.File.Delete(_file) Catch ex As Exception + Logger.Error(ex) Logger.Warn($"TempFileDelete - Could not delete the tempfile from TEMP_FILES: {ex.Message}") End Try End If