fix jobconfigparser, fix error in database->mssql, reduce logging for jobrunner

2019-04-24 11:47:34 +02:00
parent 0bf0f8a05d
commit b387ff5376
6 changed files with 108 additions and 101 deletions
--- a/Modules.Database/MSSQLServer.vb
+++ b/Modules.Database/MSSQLServer.vb
@@ -4,73 +4,67 @@ Imports DigitalData.Modules.Logging
 Public Class MSSQLServer
    Public DBInitialized As Boolean = False
    Public CurrentSQLConnectionString As String = ""
-    Private CurrentSQLConnection As SqlConnection
    Private _Logger As Logger

    Public Sub New(LogConfig As LogConfig, ConnectionString As String)
        _Logger = LogConfig.GetLogger()

+        CurrentSQLConnectionString = ConnectionString
+
        Try
-            Dim oSQLconnect As New SqlConnection
-            oSQLconnect.ConnectionString = ConnectionString
-            oSQLconnect.Open()
-            oSQLconnect.Close()
-            CurrentSQLConnectionString = ConnectionString
-            DBInitialized = True
+            DBInitialized = TestCanConnect()
        Catch ex As Exception
            DBInitialized = False
            _Logger.Error(ex)
        End Try
    End Sub

-    Private Function GetSQLConnection()
+    Private Function TestCanConnect() As Boolean
        Try
-            If IsNothing(CurrentSQLConnection) Then
-                Dim oSQLconnect As New SqlClient.SqlConnection
-                oSQLconnect.ConnectionString = CurrentSQLConnectionString
-                CurrentSQLConnection = oSQLconnect
-                CurrentSQLConnection.Open()
-            Else
-                If CurrentSQLConnection.State <> ConnectionState.Open Then
-                    _Logger.Warn($"Actual ConnectionState is: '{CurrentSQLConnection.State.ToString}'")
-                    Try
-                        CurrentSQLConnection.Open()
-                        Return True
-                    Catch ex As Exception
-                        _Logger.Warn("Could not reconnect to database!")
-                        Return False
-                    End Try
-                End If
-            End If
+            Dim oConnection As New SqlConnection(CurrentSQLConnectionString)
+            oConnection.Open()
+            oConnection.Close()
            Return True
        Catch ex As Exception
            _Logger.Error(ex)
            Return False
        End Try
    End Function
+
+    Private Function GetSQLConnection() As SqlConnection
+        Try
+            Dim oConnection As New SqlConnection(CurrentSQLConnectionString)
+            oConnection.Open()
+            Return oConnection
+        Catch ex As Exception
+            _Logger.Error(ex)
+            Return Nothing
+        End Try
+    End Function
    ''' <summary>
    ''' Returns a datatable for a sql-statement 
    ''' </summary>
    ''' <param name="sqlcommand">sqlcommand for datatable (select XYZ from TableORView)</param>
-    ''' <param name="commandtimeout">Optional Timeout</param>
+    ''' <param name="Timeout">Optional Timeout</param>
    ''' <returns>Returns a datatable</returns>
    ''' <remarks></remarks>
-    Public Function GetDatatable(sqlcommand As String, Optional commandtimeout As Integer = 120) As DataTable
+    Public Function GetDatatable(sqlcommand As String, Optional Timeout As Integer = 120) As DataTable
        Try
-            Dim dt As DataTable = New DataTable()
-            If GetSQLConnection() = False Then
+            If TestCanConnect() = False Then
                Return Nothing
            End If

-            Dim oSQLCOmmand As SqlCommand
+            Using oConnection = GetSQLConnection()
+                Using oSQLCOmmand = oConnection.CreateCommand()
+                    oSQLCOmmand.CommandText = sqlcommand
+                    oSQLCOmmand.CommandTimeout = Timeout

-            oSQLCOmmand = CurrentSQLConnection.CreateCommand()
-            oSQLCOmmand.CommandText = sqlcommand
-            oSQLCOmmand.CommandTimeout = commandtimeout
-            Dim adapter1 As SqlDataAdapter = New SqlDataAdapter(oSQLCOmmand)
-            adapter1.Fill(dt)
-
-            Return dt
+                    Dim dt As DataTable = New DataTable()
+                    Dim oAdapter As SqlDataAdapter = New SqlDataAdapter(oSQLCOmmand)
+                    oAdapter.Fill(dt)
+                    Return dt
+                End Using
+            End Using
        Catch ex As Exception
            _Logger.Error(ex)
            _Logger.Debug("sqlcommand: " & sqlcommand)
@@ -81,29 +75,58 @@ Public Class MSSQLServer
    ''' Executes the passed sql-statement 
    ''' </summary>
    ''' <param name="executeStatement">the sql statement</param>
-    ''' <param name="commandtimeout">Optional Timeout</param>
+    ''' <param name="Timeout">Optional Timeout</param>
    ''' <returns>Returns true if properly executed, else false</returns>
    ''' <remarks></remarks>
-    Public Function NewExecutenonQuery(executeStatement As String, Optional commandtimeout As Integer = 120) As Boolean
+    Public Function NewExecutenonQuery(executeStatement As String, Optional Timeout As Integer = 120) As Boolean
        Try
-            If GetSQLConnection() = False Then
+            If TestCanConnect() = False Then
                Return Nothing
            End If
-            'Dim oSQLconnect As New SqlClient.SqlConnection
-            Dim oSQLCOmmand As SqlCommand

-            oSQLCOmmand = CurrentSQLConnection.CreateCommand()
-            oSQLCOmmand.CommandText = executeStatement
-            oSQLCOmmand.CommandTimeout = commandtimeout
-            oSQLCOmmand.ExecuteNonQuery()
-            oSQLCOmmand.Dispose()
-            Return True
+            Using oConnection = GetSQLConnection()
+                Using oSQLCOmmand = oConnection.CreateCommand()
+                    oSQLCOmmand.CommandText = executeStatement
+                    oSQLCOmmand.CommandTimeout = Timeout
+                    oSQLCOmmand.ExecuteNonQuery()
+                    Return True
+                End Using
+            End Using
        Catch ex As Exception
            _Logger.Error(ex)
            _Logger.Debug("executeStatement: " & executeStatement)
            Return False
        End Try
    End Function
+
+    ''' <summary>
+    ''' Executes the passed sql-statement as Scalar
+    ''' </summary>
+    ''' <param name="ScalarSQL">the sql statement</param>
+    ''' <param name="Timeout">Optional Timeout</param>
+    ''' <returns>Returns true if properly executed, else false</returns>
+    ''' <remarks></remarks>
+    Public Function NewExecuteScalar(ScalarSQL As String, Optional Timeout As Integer = 120) As Object
+        Try
+            If TestCanConnect() = False Then
+                Return Nothing
+            End If
+
+            Using oConnection As SqlConnection = GetSQLConnection()
+                Using oSQLCOmmand = oConnection.CreateCommand()
+                    oSQLCOmmand.CommandText = ScalarSQL
+                    oSQLCOmmand.CommandTimeout = Timeout
+                    Dim oResult As Object = oSQLCOmmand.ExecuteScalar()
+                    Return oResult
+                End Using
+            End Using
+        Catch ex As Exception
+            _Logger.Error(ex)
+            _Logger.Debug("executeStatement: " & ScalarSQL)
+            Return Nothing
+        End Try
+    End Function
+
    ''' <summary>
    ''' Executes the passed sql-statement in asyncmode
    ''' </summary>
@@ -111,18 +134,20 @@ Public Class MSSQLServer
    ''' <param name="commandtimeout">Optional Timeout</param>
    ''' <remarks></remarks>
    Public Sub NewExecuteNonQueryAsync(executeStatement As String, Optional commandtimeout As Integer = 120)
-        If GetSQLConnection() = False Then
+        If TestCanConnect() = False Then
            Exit Sub
        End If

-        Dim oSQLCOmmand As SqlCommand
-        Dim callback As New AsyncCallback(AddressOf NewExecuteNonQueryAsync_Callback)
        Try
-            oSQLCOmmand = CurrentSQLConnection.CreateCommand()
-            oSQLCOmmand.CommandText = executeStatement
-            oSQLCOmmand.CommandTimeout = commandtimeout
-            oSQLCOmmand.BeginExecuteNonQuery(callback, oSQLCOmmand)
-            oSQLCOmmand.Dispose()
+            Dim oCallback As New AsyncCallback(AddressOf NewExecuteNonQueryAsync_Callback)
+
+            Using oConnection As SqlConnection = GetSQLConnection()
+                Using oSQLCOmmand = oConnection.CreateCommand()
+                    oSQLCOmmand.CommandText = executeStatement
+                    oSQLCOmmand.CommandTimeout = commandtimeout
+                    oSQLCOmmand.BeginExecuteNonQuery(oCallback, oSQLCOmmand)
+                End Using
+            End Using
        Catch ex As Exception
            _Logger.Error(ex)
            _Logger.Debug("executeStatement: " & executeStatement)
@@ -132,33 +157,6 @@ Public Class MSSQLServer
    Private Sub NewExecuteNonQueryAsync_Callback(ByVal result As IAsyncResult)
        Dim command As SqlCommand = CType(result.AsyncState, SqlCommand)
        Dim res = command.EndExecuteNonQuery(result)
-        _Logger.Info(String.Format("Finished executing Async database operation: {0}", command.CommandText))
+        _Logger.Info("Finished executing Async database operation: {0}", command.CommandText)
    End Sub
-    ''' <summary>
-    ''' Executes the passed sql-statement as Scalar
-    ''' </summary>
-    ''' <param name="executeStatement">the sql statement</param>
-    ''' <param name="commandtimeout">Optional Timeout</param>
-    ''' <returns>Returns true if properly executed, else false</returns>
-    ''' <remarks></remarks>
-    Public Function NewExecuteScalar(executeStatement As String, Optional commandtimeout As Integer = 120)
-        Dim result
-        Try
-            If GetSQLConnection() = False Then
-                Return Nothing
-            End If
-
-            Dim oSQLCOmmand As SqlClient.SqlCommand
-            oSQLCOmmand = CurrentSQLConnection.CreateCommand()
-            oSQLCOmmand.CommandText = executeStatement
-            oSQLCOmmand.CommandTimeout = commandtimeout
-            result = oSQLCOmmand.ExecuteScalar()
-            oSQLCOmmand.Dispose()
-            Return result
-        Catch ex As Exception
-            _Logger.Error(ex)
-            _Logger.Debug("executeStatement: " & executeStatement)
-            Return Nothing
-        End Try
-    End Function
 End Class