ZUGFeRDService: Integrate with Config Module, Remove My.Settings

This commit is contained in:
Jonathan Jenne
2021-05-10 14:27:09 +02:00
parent a4b7cfd9ef
commit 2ae4c9a555
9 changed files with 55 additions and 211 deletions

View File

@@ -1,9 +1,11 @@
Imports System.IO
Imports DigitalData.Modules.Config
Imports DigitalData.Modules.Database
Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Logging.LogConfig
Public Class ZUGFeRDService
Private _config As ConfigManager(Of Config)
Private _logConfig As LogConfig
Private _logger As Logger
Private _firebird As Firebird
@@ -11,9 +13,10 @@ Public Class ZUGFeRDService
Private _threadRunner As ThreadRunner
Protected Overrides Sub OnStart(ByVal args() As String)
Protected Overrides Sub OnStart(args() As String)
_logConfig = New LogConfig(PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"), Nothing, "Digital Data", "DDZUGFeRDService")
_logConfig.Debug = My.Settings.DEBUG
_config = New ConfigManager(Of Config)(_logConfig, My.Application.Info.DirectoryPath)
_logConfig.Debug = _config.Config.Debug
_logger = _logConfig.GetLogger()
Try
Dim directory As New IO.DirectoryInfo(_logConfig.LogDirectory)
@@ -24,22 +27,20 @@ Public Class ZUGFeRDService
Else
Exit For
End If
Next
Catch ex As Exception
End Try
_logger.Info($"{My.Settings.SERVICE_NAME} is starting.")
_logger.Info($"{Constants.SERVICE_NAME} is starting.")
Dim oDataSource As String = My.Settings.DB_DATASOURCE
Dim oDatabase As String = My.Settings.DB_DATABASE
Dim oUser As String = My.Settings.DB_USER
Dim oPassword As String = My.Settings.DB_PASSWORD
Dim oJobInterval As Integer = My.Settings.JOB_INTERVAL
Dim oMSSQLConnectionString As String = My.Settings.MSSQL_CONNECTIONSTRING
Dim oMSSQLEnabled As Boolean = My.Settings.MSSQL_ENABLED
Dim oGDPictureKey As String = My.Settings.GDPICTURE_KEY
Dim oDataSource As String = _config.Config.Firebird.DataSource
Dim oDatabase As String = _config.Config.Firebird.Database
Dim oUser As String = _config.Config.Firebird.User
Dim oPassword As String = _config.Config.Firebird.Password
Dim oJobInterval As Integer = _config.Config.JobInterval
Dim oMSSQLConnectionString As String = _config.Config.MSSQLConnectionString
Dim oMSSQLEnabled As Boolean = _config.Config.MSSQLEnabled
Dim oGDPictureKey As String = _config.Config.GDPictureKey
_firebird = New Firebird(_logConfig, oDataSource, oDatabase, oUser, oPassword)
@@ -53,7 +54,7 @@ Public Class ZUGFeRDService
End If
Try
_threadRunner = New ThreadRunner(_logConfig, _firebird, _mssql)
_threadRunner = New ThreadRunner(_logConfig, _config, _firebird, _mssql)
_threadRunner.Start(oJobInterval)
Catch ex As Exception
_logger.Error(ex)
@@ -61,7 +62,7 @@ Public Class ZUGFeRDService
End Sub
Protected Overrides Sub OnStop()
_logger.Info($"{My.Settings.SERVICE_NAME} is stopping.")
_logger.Info($"{Constants.SERVICE_NAME} is stopping.")
_threadRunner.Stop()
End Sub