ZooFlow: integrate service config

This commit is contained in:
Jonathan Jenne 2020-12-23 16:14:02 +01:00
parent 4a437c6826
commit 088c330f0c
3 changed files with 18 additions and 11 deletions

View File

@ -18,11 +18,6 @@ Public Class ClassInit
Public Sub New(LogConfig As LogConfig, ParentForm As frmFlowForm) Public Sub New(LogConfig As LogConfig, ParentForm As frmFlowForm)
_MainForm = ParentForm _MainForm = ParentForm
_Logger = LogConfig.GetLogger() _Logger = LogConfig.GetLogger()
Try
Catch ex As Exception
End Try
End Sub End Sub
Public Sub InitializeApplication() Public Sub InitializeApplication()
@ -42,7 +37,8 @@ Public Class ClassInit
' === Init Schritte definieren ' === Init Schritte definieren
oInit.AddStep("Checking connectivity..", AddressOf CheckConnectivity, True) oInit.AddStep("Checking connectivity..", AddressOf CheckConnectivity, True)
oInit.AddStep("Initializing User..", AddressOf InitializeUser, True) oInit.AddStep("Initializing User..", AddressOf InitializeUser, True)
oInit.AddStep("Initializing IDB..", AddressOf InitializeIDB, True) oInit.AddStep("Initializing IDB Database..", AddressOf InitializeIDBDatabase, True)
oInit.AddStep("Initializing IDB Service..", AddressOf InitializeIDBService, True)
oInit.AddStep("Initializing Language..", AddressOf InitializeLanguage, False) oInit.AddStep("Initializing Language..", AddressOf InitializeLanguage, False)
oInit.AddStep("Loading 3rd-party licenses..", AddressOf Initialize3rdParty, False) oInit.AddStep("Loading 3rd-party licenses..", AddressOf Initialize3rdParty, False)
oInit.AddStep("Loading Basic Configs..", AddressOf InitBasicData, False) oInit.AddStep("Loading Basic Configs..", AddressOf InitBasicData, False)
@ -139,16 +135,23 @@ Public Class ClassInit
Dim oSql = "SELECT * FROM TBGI_FUNCTION_REGEX" Dim oSql = "SELECT * FROM TBGI_FUNCTION_REGEX"
My.Application.Globix.DT_FUNCTION_REGEX = My.Database.GetDatatable(oSql) My.Application.Globix.DT_FUNCTION_REGEX = My.Database.GetDatatable(oSql)
Catch ex As Exception Catch ex As Exception
_Logger.Error(ex) _Logger.Error(ex)
Throw New InitException("Error in InitBasicData") Throw New InitException("Error in InitBasicData")
End Try End Try
End Sub End Sub
Private Sub InitializeIDB(MyApplication As My.MyApplication) Private Sub InitializeIDBService(MyApplication As My.MyApplication)
Try
MyApplication.Service.Address = My.SystemConfig.AppServerConfig
MyApplication.Service.IsActive = True
Catch ex As Exception
_Logger.Error(ex)
Throw New InitException("Error in InitBasicData")
End Try
End Sub
Private Sub InitializeIDBDatabase(MyApplication As My.MyApplication)
If MyApplication.ModulesActive.Contains(MODULE_ZOOFLOW) Then If MyApplication.ModulesActive.Contains(MODULE_ZOOFLOW) Then
If My.Database.DBInitialized Then If My.Database.DBInitialized Then
Dim oSQl = "SELECT * FROM TBDD_CONNECTION WHERE BEZEICHNUNG = 'IDB'" Dim oSQl = "SELECT * FROM TBDD_CONNECTION WHERE BEZEICHNUNG = 'IDB'"

View File

@ -40,6 +40,9 @@ Public Class ClassConfig
<ConnectionString> <ConnectionString>
Public Property ConnectionString As String = String.Empty Public Property ConnectionString As String = String.Empty
<GlobalSetting>
Public Property AppServerConfig As String = "172.24.12.39:9000"
' === Logging Configuration ' === Logging Configuration
Public Property LogDebug As Boolean = False Public Property LogDebug As Boolean = False

View File

@ -944,7 +944,8 @@ Public Class frmSearchStart
.Modules = My.Application.Modules, .Modules = My.Application.Modules,
.Database = My.Database, .Database = My.Database,
.DatabaseIDB = My.DatabaseIDB, .DatabaseIDB = My.DatabaseIDB,
.Settings = My.Application.Settings .Settings = My.Application.Settings,
.Service = My.Application.Service
} }
Dim oDTSearchResult As DataTable = My.DatabaseIDB.GetDatatable(oSearchSQL) Dim oDTSearchResult As DataTable = My.DatabaseIDB.GetDatatable(oSearchSQL)
If oDTSearchResult.Rows.Count > 0 Then If oDTSearchResult.Rows.Count > 0 Then