diff --git a/Modules.Database/Database.vbproj b/Modules.Database/Database.vbproj index f5fd58af..78456acd 100644 --- a/Modules.Database/Database.vbproj +++ b/Modules.Database/Database.vbproj @@ -131,5 +131,11 @@ + + + {903b2d7d-3b80-4be9-8713-7447b704e1b0} + Logging + + \ No newline at end of file diff --git a/Modules.Database/Firebird.vb b/Modules.Database/Firebird.vb index d125ad0c..c2a9b95c 100644 --- a/Modules.Database/Firebird.vb +++ b/Modules.Database/Firebird.vb @@ -1,11 +1,11 @@ -Imports NLog -Imports FirebirdSql.Data.FirebirdClient +Imports FirebirdSql.Data.FirebirdClient Imports System.Text.RegularExpressions +Imports DigitalData.Modules.Logging ''' ''' MODULE: Firebird ''' -''' VERSION: 0.0.0.1 +''' VERSION: 0.0.0.2 ''' ''' DATE: 03.09.2018 ''' @@ -47,7 +47,7 @@ Imports System.Text.RegularExpressions ''' Public Class Firebird Private _logger As Logger - Private _logFactory As LogFactory + Private _logConfig As LogConfig Private _connectionServer As String Private _connectionDatabase As String Private _connectionUsername As String @@ -74,9 +74,9 @@ Public Class Firebird ''' ''' ''' - Public Sub New(LogFactory As LogFactory, Datasource As String, Database As String, User As String, Password As String) - _logger = LogFactory.GetCurrentClassLogger() - _logFactory = LogFactory + Public Sub New(LogConfig As LogConfig, Datasource As String, Database As String, User As String, Password As String) + _logger = LogConfig.GetLogger() + _logConfig = LogConfig Dim oConnectionString = GetConnectionString(Datasource, Database, User, Password) diff --git a/Modules.Database/My Project/AssemblyInfo.vb b/Modules.Database/My Project/AssemblyInfo.vb index efe5c191..a9b1823b 100644 --- a/Modules.Database/My Project/AssemblyInfo.vb +++ b/Modules.Database/My Project/AssemblyInfo.vb @@ -10,7 +10,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - +