use Logging Module EVERYWHERE, fix some MarvMan bugs

This commit is contained in:
Jonathan Jenne
2020-03-04 12:24:43 +01:00
parent 13b36db5fb
commit c8c650922b
22 changed files with 1279 additions and 1178 deletions

View File

@@ -17,7 +17,8 @@ Public Class ClassDatabase
SQLconnect.Close()
Return True
Catch ex As Exception
ClassLogger.Add("Unexpected error in Database-Init: " & ex.Message, True)
LOGGER.Info("Unexpected error in Database-Init: " & ex.Message)
LOGGER.Error(ex.Message)
Return False
End Try
End Function
@@ -47,11 +48,11 @@ Public Class ClassDatabase
' Dim conn As New OdbcConnection("dsn=" & DTConnection.Rows(0).Item("SERVER") & ";uid=" & DTConnection.Rows(0).Item("USERNAME") & ";pwd=" + DTConnection.Rows(0).Item("PASSWORD"))
' connectionString = conn.ConnectionString
Case Else
LOGGER.Info(" - ConnectionType nicht integriert", False)
LOGGER.Info(" - ConnectionType nicht integriert")
MsgBox("ConnectionType nicht integriert", MsgBoxStyle.Critical, "Bitte Konfiguration Connection überprüfen!")
End Select
Else
LOGGER.Info(" No entry for Connection-ID: " & id.ToString, True)
LOGGER.Info(" No entry for Connection-ID: " & id.ToString)
End If
Catch ex As Exception
@@ -94,8 +95,8 @@ Public Class ClassDatabase
If userInput = True Then
MsgBox("Error in Return_Datatable - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
End If
ClassLogger.Add("Unexpected error in Return_Datatable: " & ex.Message, True)
ClassLogger.Add("#SQL: " & sql_command, False)
LOGGER.Info("Unexpected error in Return_Datatable: " & ex.Message)
LOGGER.Info("#SQL: " & sql_command)
End If
Return False
@@ -103,8 +104,8 @@ Public Class ClassDatabase
If userInput = True Then
MsgBox("Error in Return Datatable - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
End If
ClassLogger.Add("Unexpected error in Return_Datatable: " & ex.Message, True)
ClassLogger.Add("#SQL: " & sql_command, False)
LOGGER.Info("Unexpected error in Return_Datatable: " & ex.Message)
LOGGER.Info("#SQL: " & sql_command)
Return Nothing
End Try
End Function
@@ -133,8 +134,8 @@ Public Class ClassDatabase
If userInput = True Then
MsgBox("Error in Return_Datatable_CS - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
End If
ClassLogger.Add("Unexpected error in Return_Datatable_CS: " & ex.Message, True)
ClassLogger.Add("#SQL: " & sql_command, False)
LOGGER.Info("Unexpected error in Return_Datatable_CS: " & ex.Message)
LOGGER.Info("#SQL: " & sql_command)
End If
Return False
@@ -142,8 +143,8 @@ Public Class ClassDatabase
If userInput = True Then
MsgBox("Error in Return_Datatable_CS - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
End If
ClassLogger.Add("Unexpected error in Return_Datatable_CS: " & ex.Message, True)
ClassLogger.Add("#SQL: " & sql_command, False)
LOGGER.Info("Unexpected error in Return_Datatable_CS: " & ex.Message)
LOGGER.Info("#SQL: " & sql_command)
Return Nothing
End Try
End Function
@@ -171,8 +172,8 @@ Public Class ClassDatabase
If userInput = True Then
MsgBox("Error in Execute non query - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
End If
ClassLogger.Add("Unexpected error in Execute_non_Query: " & ex.Message, True)
ClassLogger.Add("#SQL: " & sql_command, False)
LOGGER.Info("Unexpected error in Execute_non_Query: " & ex.Message)
LOGGER.Info("#SQL: " & sql_command)
End If
Return False
@@ -180,8 +181,8 @@ Public Class ClassDatabase
If userInput = True Then
MsgBox("Error in Execute non query - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
End If
ClassLogger.Add("Unexpected error in Execute_non_Query: " & ex.Message, True)
ClassLogger.Add("#SQL: " & sql_command, False)
LOGGER.Info("Unexpected error in Execute_non_Query: " & ex.Message)
LOGGER.Info("#SQL: " & sql_command)
Return False
End Try
@@ -211,8 +212,8 @@ Public Class ClassDatabase
If userInput = True Then
MsgBox("Error in Execute non query - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
End If
ClassLogger.Add("Unexpected error in Execute_non_Query: " & ex.Message, True)
ClassLogger.Add("#SQL: " & sql_command, False)
LOGGER.Info("Unexpected error in Execute_non_Query: " & ex.Message)
LOGGER.Info("#SQL: " & sql_command)
End If
Return False
@@ -220,8 +221,8 @@ Public Class ClassDatabase
If userInput = True Then
MsgBox("Error in Execute Scalar - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
End If
ClassLogger.Add("Unexpected error in Execute_Scalar: " & ex.Message, True)
ClassLogger.Add("#SQL: " & sql_command, False)
LOGGER.Info("Unexpected error in Execute_Scalar: " & ex.Message)
LOGGER.Info("#SQL: " & sql_command)
Return Nothing
End Try
End Function
@@ -240,8 +241,9 @@ Public Class ClassDatabase
SQLconnect.Close()
Return result
Catch ex As Exception
ClassLogger.Add("Unexpected error in OracleExecute_Scalar: " & ex.Message, True)
ClassLogger.Add("#SQL: " & cmdscalar, False)
LOGGER.Info("Unexpected error in OracleExecute_Scalar: " & ex.Message)
LOGGER.Error(ex.Message)
LOGGER.Info("#SQL: " & cmdscalar)
Return Nothing
End Try
End Function
@@ -262,8 +264,8 @@ Public Class ClassDatabase
If userInput = True Then
MsgBox("Error in OracleExecute_non_Query - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
End If
ClassLogger.Add("Unexpected error in OracleExecute_non_Query: " & ex.Message, True)
ClassLogger.Add("#SQL: " & ExecuteCMD, False)
LOGGER.Info("Unexpected error in OracleExecute_non_Query: " & ex.Message)
LOGGER.Info("#SQL: " & ExecuteCMD)
Return False
End Try
@@ -287,8 +289,8 @@ Public Class ClassDatabase
If userInput = True Then
MsgBox("Error in Oracle Return Datatable - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & Select_anweisung, MsgBoxStyle.Critical)
End If
ClassLogger.Add("Unexpected error in Oracle_Return_Datatable: " & ex.Message, True)
ClassLogger.Add("#SQL: " & Select_anweisung, False)
LOGGER.Info("Unexpected error in Oracle_Return_Datatable: " & ex.Message)
LOGGER.Info("#SQL: " & Select_anweisung)
Return Nothing
End Try
End Function
@@ -299,8 +301,8 @@ Public Class ClassDatabase
If FatalErrors.Contains(ex.Number) Then
DatabaseConnectionTimeout = True
ClassLogger.Add("Network timeout error in Return_Datatable: " & ex.Message, True)
ClassLogger.Add("#SQL: " & sql_command, False)
LOGGER.Info("Network timeout error in Return_Datatable: " & ex.Message)
LOGGER.Info("#SQL: " & sql_command)
Return True
Else