EMailProfiler: Config-Daten in zentraler Klasse. abfrage der GDPicture Lizenz über Config-Modul

App/EmailProfiler.Service/Config.vb

@@ -24,4 +24,11 @@ Public Class Config
 
     Public Property EmailTestReceiver As String = ""
     Public Property EmailTestHTML As String = ""
+
+    ''' <summary>
+    ''' Enthält die Version des GDPicture Modules,
+    ''' für das der Lizenzschlüssel aus TBDD_3RD_PARTY_MODULES
+    ''' gelesen werden soll.
+    ''' </summary>
+    Public Property GDPictureVersion As String = ""
 End Class

App/EmailProfiler.Service/MyService.vb

@@ -4,6 +4,7 @@ Imports EmailProfiler.Common
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
+
 Public Class MyService
 #Region "+++++ variables +++++"
     Private Worker As BackgroundWorker
@@ -11,17 +12,17 @@ Public Class MyService
 
     Private LogConfig As LogConfig
     Private Logger As Logger
-    'Private _database As clsDatabase
+
     Private EmailWorker As clsWorkEmail
 
-    Private DBConfigManager As ClassDBConfig
-    Private DBConfig As ClassDBConfig.Config
+    Private _DBConfig As ClassDBConfig.Config
 
-    Private ConfigManager As ConfigManager(Of Config)
-    Private Config As Config
+    Private ConfigManager As ConfigManager(Of ConfigData)
+    Private _ConfigData As ConfigData
 
     Private Database As MSSQLServer
 #End Region
+
     Protected Overrides Sub OnStart(args() As String)
         Try
             Dim oLogPath = Path.Combine(My.Application.Info.DirectoryPath, "Log")
@@ -30,33 +31,31 @@ Public Class MyService
 
             Logger.Info("Service started.")
 
-            ConfigManager = New ConfigManager(Of Config)(LogConfig, My.Application.Info.DirectoryPath)
-            Config = ConfigManager.Config
+            ConfigManager = New ConfigManager(Of ConfigData)(LogConfig, My.Application.Info.DirectoryPath)
+            _ConfigData = ConfigManager.Config
 
-            If Config.ConnectionString = String.Empty Then
+            If _ConfigData.ConnectionString = String.Empty Then
                 Logger.Warn("No ConnectionString configured. Exiting.")
             Else
-                If Config.Debug = True Then
+                If _ConfigData.Debug = True Then
                     LogConfig.Debug = True
                 Else
                     LogConfig.Debug = False
                 End If
 
-                Database = New MSSQLServer(LogConfig, Config.ConnectionString)
+                Database = New MSSQLServer(LogConfig, _ConfigData.ConnectionString)
                 Logger.Debug("Database initialized!")
 
-                DBConfigManager = New ClassDBConfig(LogConfig, Database)
-                DBConfig = DBConfigManager.GetConfig()
+                Dim oDBConfigManager As ClassDBConfig = New ClassDBConfig(LogConfig, Database)
+                _DBConfig = oDBConfigManager.GetConfig()
 
-                If DBConfig IsNot Nothing Then
+                If _DBConfig IsNot Nothing Then
                     Logger.Debug("DBConfig initialized!")
                 Else
                     Logger.Warn("Error while initializing DBConfig")
                 End If
 
-                EmailWorker = New clsWorkEmail(LogConfig, Config.ConnectionString, DBConfig.WindreamConnectionString,
-                                                Config.UseWindream, Config.EmailAccountId, Config.EmailTitlePrefix,
-                                                Config.RejectionTemplateId, Config.InfoTemplateId)
+                EmailWorker = New clsWorkEmail(LogConfig, _ConfigData.ConnectionString, _DBConfig.WindreamConnectionString, _ConfigData)
                 Logger.Debug("Module Workmail initialized")
 
                 If Database.DBInitialized = False Then
@@ -72,7 +71,7 @@ Public Class MyService
                     AddHandler Worker.RunWorkerCompleted, AddressOf Worker_Completed
 
                     ' Set the Interval
-                    Timer.Interval = DBConfig.TimerInterval * 60000
+                    Timer.Interval = _DBConfig.TimerInterval * 60000
                     Timer.Enabled = True
                     Logger.Debug("Timer started.")
 
@@ -97,15 +96,10 @@ Public Class MyService
             Dim oProfileIdForPolling = 0
 
             Dim oWorker As New clsWorker(LogConfig,
-                                         Config.ConnectionString,
-                                         DBConfig.WindreamConnectionString,
+                                         _ConfigData.ConnectionString,
+                                         _DBConfig.WindreamConnectionString,
                                          oProfileIdForPolling,
-                                         Config.UseWindream,
-                                         Config.EmailAccountId,
-                                         Config.EmailSenderLimitation,
-                                         Config.EmailTitlePrefix,
-                                         Config.RejectionTemplateId,
-                                         Config.InfoTemplateId)
+                                         _ConfigData)
             oWorker.Start_WorkingProfiles(False, True)
         Catch ex As Exception
             Logger.Error(ex)
@@ -114,6 +108,7 @@ Public Class MyService
     Protected Overrides Sub OnStop()
         Logger.Info("## Service was stopped manually. ##")
     End Sub
+
     Private Sub Worker_Completed(sender As Object, e As RunWorkerCompletedEventArgs)
         'This event fires when the DoWork event completes
         Try