AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Migrate from Filesystem to Base

Browse Source
This commit is contained in:
Jonathan Jenne
2023-09-18 09:34:44 +02:00
parent 7aec23abd9
commit ba55b17009
14 changed files with 43 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Services.ZUGFeRDService/My Project/AssemblyInfo.vb
View File

@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("DDZUGFeRDService")>
<Assembly: AssemblyCopyright("Copyright © 2023")>
<Assembly: AssemblyTrademark("2.5.0.1")>
<Assembly: AssemblyTrademark("2.5.0.3")>
<Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.5.0.1")>
<Assembly: AssemblyFileVersion("2.5.0.1")>
<Assembly: AssemblyVersion("2.5.0.3")>
<Assembly: AssemblyFileVersion("2.5.0.3")>

50
Services.ZUGFeRDService/ThreadRunner.vb
View File

@@ -18,6 +18,8 @@ Public Class ThreadRunner
Private ReadOnly _jobArguments As WorkerArgs
Private ReadOnly _mssql As MSSQLServer
Private BusyCounter As Integer = 0
Public Sub New(LogConfig As LogConfig, ConfigManager As ConfigManager(Of Config), MSSQL As MSSQLServer)
_logConfig = LogConfig
_logger = _logConfig.GetLogger()
@@ -55,49 +57,47 @@ Public Class ThreadRunner
oArgs = LoadPropertyMap(oArgs)
_logger.Debug("Custom Options:")
_logger.Debug("ExceptionEmailAddress: {0}", oArgs.ExceptionEmailAddress)
_logger.Debug("IgnoreRejectionStatus: {0}", oArgs.IgnoreRejectionStatus)
_logger.Debug("MaxAttachmentSizeInMegaBytes: {0}", oArgs.MaxAttachmentSizeInMegaBytes)
_logger.Debug("ExceptionEmailAddress: [{0}]", oArgs.ExceptionEmailAddress)
_logger.Debug("IgnoreRejectionStatus: [{0}]", oArgs.IgnoreRejectionStatus)
_logger.Debug("MaxAttachmentSizeInMegaBytes: [{0}]", oArgs.MaxAttachmentSizeInMegaBytes)
_jobArguments = oArgs
_logger.Debug("Checking SuccessDirectory {0}", oArgs.SuccessDirectory)
_logger.Debug("Checking SuccessDirectory [{0}]", oArgs.SuccessDirectory)
If Not Directory.Exists(oArgs.SuccessDirectory) Then
_logger.Warn("SuccessDirectory {0} does not exist!", oArgs.SuccessDirectory)
_logger.Warn("SuccessDirectory [{0}] does not exist!", oArgs.SuccessDirectory)
End If
_logger.Debug("Checking ErrorDirectory {0}", oArgs.ErrorDirectory)
_logger.Debug("Checking ErrorDirectory [{0}]", oArgs.ErrorDirectory)
If Not Directory.Exists(oArgs.ErrorDirectory) Then
_logger.Warn("ErrorDirectory {0} does not exist!", oArgs.ErrorDirectory)
_logger.Warn("ErrorDirectory [{0}] does not exist!", oArgs.ErrorDirectory)
End If
_logger.Debug("Checking Original Email Directory {0}", oArgs.OriginalEmailDirectory)
_logger.Debug("Checking Original Email Directory [{0}]", oArgs.OriginalEmailDirectory)
If Not Directory.Exists(oArgs.OriginalEmailDirectory) Then
_logger.Warn("OriginalEmailDirectory {0} does not exist!", oArgs.OriginalEmailDirectory)
_logger.Warn("OriginalEmailDirectory [{0}] does not exist!", oArgs.OriginalEmailDirectory)
End If
_logger.Debug("Checking Rejected Email Directory {0}", oArgs.RejectedEmailDirectory)
_logger.Debug("Checking Rejected Email Directory [{0}]", oArgs.RejectedEmailDirectory)
If Not Directory.Exists(oArgs.RejectedEmailDirectory) Then
_logger.Warn("RejectedEmailDirectory {0} does not exist!", oArgs.RejectedEmailDirectory)
_logger.Warn("RejectedEmailDirectory [{0}] does not exist!", oArgs.RejectedEmailDirectory)
End If
_logger.Debug("Checking Non ZUGFeRD Directory {0}", oArgs.NonZugferdDirectory)
_logger.Debug("Checking Non ZUGFeRD Directory [{0}]", oArgs.NonZugferdDirectory)
If Not Directory.Exists(oArgs.NonZugferdDirectory) Then
_logger.Warn("NonZugferdDirectory {0} does not exist!", oArgs.NonZugferdDirectory)
_logger.Warn("NonZugferdDirectory [{0}] does not exist!", oArgs.NonZugferdDirectory)
End If
_logger.Debug("Checking Exception Email Adress {0}", oArgs.ExceptionEmailAddress)
_logger.Debug("Checking Watch Directory [{0}]", oArgs.WatchDirectory)
If Not Directory.Exists(oArgs.WatchDirectory) Then
_logger.Warn("WatchDirectory [{0}] does not exist!", oArgs.WatchDirectory)
End If
_logger.Debug("Checking Exception Email Adress [{0}]", oArgs.ExceptionEmailAddress)
If oArgs.ExceptionEmailAddress = String.Empty Then
_logger.Warn("ExceptionEmailAddress {0} is not set!", oArgs.ExceptionEmailAddress)
_logger.Warn("ExceptionEmailAddress [{0}] is not set!", oArgs.ExceptionEmailAddress)
End If
For Each oDirectory In oArgs.WatchDirectories
_logger.Debug("Checking WatchDirectory {0}", oDirectory)
If Not Directory.Exists(oDirectory) Then
_logger.Warn("WatchDirectory {0} does not exist!", oDirectory)
End If
Next
_workerThread = New BackgroundWorker() With {
.WorkerReportsProgress = False,
.WorkerSupportsCancellation = True
@@ -127,9 +127,11 @@ Public Class ThreadRunner
Private Sub TimerElapsed(sender As Object, e As ElapsedEventArgs) Handles _workerTimer.Elapsed
If Not _workerThread.IsBusy Then
BusyCounter = 0
_workerThread.RunWorkerAsync(_jobArguments)
Else
_logger.Info("Worker is busy, skipping execution.")
BusyCounter = +1
_logger.Info("Worker is busy, skipping execution. Tried for [{0}] times.", BusyCounter)
End If
End Sub
@@ -151,7 +153,7 @@ Public Class ThreadRunner
End Sub
Private Function LoadFolderConfig(pArgs As WorkerArgs) As WorkerArgs
pArgs.WatchDirectories.Add(_config.Config.WatchDirectory)
pArgs.WatchDirectory = _config.Config.WatchDirectory
pArgs.SuccessDirectory = _config.Config.SuccessDirectory
pArgs.ErrorDirectory = _config.Config.ErrorDirectory
pArgs.OriginalEmailDirectory = _config.Config.OriginalEmailDirectory