From 6e8c2fb8255fab589c8fd4657e2819733d6a3908 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 20 Sep 2019 16:19:20 +0200 Subject: [PATCH] jj --- App/DigitalData.EMLProfiler/clsDatabase.vb | 2 +- App/DigitalData.EMLProfiler/clsEmail.IMAP.vb | 4 +++- App/SERV_EMAIL/MyService.vb | 13 +++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/App/DigitalData.EMLProfiler/clsDatabase.vb b/App/DigitalData.EMLProfiler/clsDatabase.vb index 13f26c7..b603e9d 100644 --- a/App/DigitalData.EMLProfiler/clsDatabase.vb +++ b/App/DigitalData.EMLProfiler/clsDatabase.vb @@ -29,7 +29,7 @@ Public Class clsDatabase TIMER_INTERVALL = DTCONFIG.Rows(0).Item("CHECK_INTERVALL_MINUTES") End If End If - MyLogger.Debug = LOG_ERRORS_ONLY + MyLogger.Debug = Not LOG_ERRORS_ONLY DT_ECM_BASE_CONFIG = Return_Datatable("select * from TBDD_BASECONFIG") Try WM_DRIVE = DT_ECM_BASE_CONFIG.Rows(0).Item("WM_DRIVE") diff --git a/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb b/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb index 4adf2d4..e7e0680 100644 --- a/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb +++ b/App/DigitalData.EMLProfiler/clsEmail.IMAP.vb @@ -10,8 +10,10 @@ Imports System.IO Public Class clsEmailIMAP Private Shared Logger As DigitalData.Modules.Logging.Logger + Private Shared LogConfig As DigitalData.Modules.Logging.LogConfig Sub New(LogConf As LogConfig) + LogConfig = LogConf Logger = LogConf.GetLogger End Sub 'Private Shared Sub OnWriteLog(ByVal sender As Object, ByVal e As WriteLogEventArgs) @@ -94,7 +96,7 @@ Public Class clsEmailIMAP End Try End Function Private Shared Sub OnWriteLog(ByVal sender As Object, ByVal e As WriteLogEventArgs) - Console.Write(e.Log) + Logger.Debug(e.Log) End Sub Public Function FetchIMAPMessagesIsoft(Server As String, Port As Integer, Username As String, Password As String, Inbox As String, Optional IsTest As Boolean = False, Optional DeleteinTest As Boolean = False, Optional MoveMailTo As String = "", Optional IsoftLog As String = "") Try diff --git a/App/SERV_EMAIL/MyService.vb b/App/SERV_EMAIL/MyService.vb index 69de3cc..25228db 100644 --- a/App/SERV_EMAIL/MyService.vb +++ b/App/SERV_EMAIL/MyService.vb @@ -29,6 +29,13 @@ Public Class MyService If My.Settings.MyConnectionString = String.Empty Then Logger.Warn("NO CONNECTIONSTRING CONFIGURED.") Else + If LOG_ERRORS_ONLY = False Then + Logger.Info("DEBUG ACTIVATED") + MyLogger.Debug = True + Else + MyLogger.Debug = False + End If + _database = New clsDatabase(MyLogger, My.Settings.MyConnectionString) _email = New clsEmail(MyLogger) _workmail = New clsWorkEmail(MyLogger, My.Settings.MyConnectionString, My.Settings.FB_DATASOURCE, My.Settings.FB_DATABASE, My.Settings.FB_USER, My.Settings.FB_PW) @@ -36,12 +43,6 @@ Public Class MyService If _database.Init(My.Settings.MyConnectionString) = False Then Logger.Warn("ATTENTION: No Connection was established '" & My.Settings.MyConnectionString & "'!") Else - If LOG_ERRORS_ONLY = False Then - Logger.Info("DEBUG ACTIVATED") - MyLogger.Debug = True - Else - MyLogger.Debug = False - End If '### Thread für das nachträgliche Setzen von Rechten generieren _threadRunner = New BackgroundWorker() _threadRunner.WorkerReportsProgress = True