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

use Logging Module EVERYWHERE, fix some MarvMan bugs

Browse Source
This commit is contained in:
Jonathan Jenne
2020-03-04 12:24:43 +01:00
parent 13b36db5fb
commit c8c650922b
22 changed files with 1279 additions and 1178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Global_Indexer/ClassInit.vb
View File

@@ -10,10 +10,9 @@ Public Class ClassInit
Public Sub InitLogger()
ClassLogger.Init("", Environment.UserName)
ClassLogger.Add(">> Programmstart: " & Now, False)
ClassLogger.Add(">> Username: " & Environment.UserName, False)
LOGCONFIG = New LogConfig(LogConfig.PathType.AppData)
LOGGER = LOGCONFIG.GetLogger("Globix")
LOGGER.Info("Programmstart: " & Now)
LOGGER.Info("Username: {0}", Environment.UserName)
End Sub
@@ -100,21 +99,21 @@ Public Class ClassInit
folderwatchPath = IIf(IsDBNull(folderwatchPath), "", folderwatchPath)
If folderwatchPath = String.Empty Then
ClassLogger.Add("Init_Folderwatch: folderwatchPath is empty", True)
LOGGER.Info("Init_Folderwatch: folderwatchPath is empty")
FW_started = False
'SaveConfigValue("FW_started", "False")
CONFIG.Config.FolderWatchStarted = False
CONFIG.Save()
End If
If Not IO.Directory.Exists(folderwatchPath) Then
ClassLogger.Add("Init_Folderwatch: folderwatchPath does not exists or is invalid path", True)
LOGGER.Info("Init_Folderwatch: folderwatchPath does not exists or is invalid path")
FW_started = False
'SaveConfigValue("FW_started", "False")
CONFIG.Config.FolderWatchStarted = False
CONFIG.Save()
End If
CURRENT_FOLDERWATCH = folderwatchPath
@@ -124,7 +123,7 @@ Public Class ClassInit
ClassFolderWatcher.StartStop_FolderWatch()
Catch ex As Exception
MsgBox($"Init_Folderwatch: Unexpected error while starting FolderWatch: {ex.Message}", MsgBoxStyle.Critical)
ClassLogger.Add($"Init_Folderwatch: Unexpected error: {ex.Message}", True)
LOGGER.Info($"Init_Folderwatch: Unexpected error: {ex.Message}")
START_INCOMPLETE = True
End Try
@@ -135,14 +134,14 @@ Public Class ClassInit
folderwatchScanPath = IIf(IsDBNull(folderwatchScanPath), "", folderwatchScanPath)
If folderwatchScanPath = String.Empty Then
ClassLogger.Add("Init_Folderwatch: folderwatchScanPath is empty", True)
LOGGER.Info("Init_Folderwatch: folderwatchScanPath is empty")
CONFIG.Config.FolderWatchStarted = False
CONFIG.Save()
Exit Sub
End If
If Not IO.Directory.Exists(folderwatchScanPath) Then
ClassLogger.Add("Init_Folderwatch: folderwatchScanPath does not exists or is invalid path", True)
LOGGER.Info("Init_Folderwatch: folderwatchScanPath does not exists or is invalid path")
CONFIG.Config.FolderWatchStarted = False
CONFIG.Save()
Exit Sub
@@ -155,7 +154,7 @@ Public Class ClassInit
ClassFolderWatcher.StartStop_FolderWatchSCAN()
Catch ex As Exception
MsgBox($"Init_Folderwatch: Unexpected error while starting FolderWatchScan: {ex.Message}", MsgBoxStyle.Critical)
ClassLogger.Add($"Init_Folderwatch: Unexpected error: {ex.Message}", True)
LOGGER.Info($"Init_Folderwatch: Unexpected error: {ex.Message}")
START_INCOMPLETE = True
End Try
@@ -180,7 +179,7 @@ Public Class ClassInit
' End If
' Else
' ClassLogger.Add("Init_Folderwatch: folderwatch path is nothing!", True)
' LOGGER.Info("Init_Folderwatch: folderwatch path is nothing!")
' End If
' If Not folderwatch_SCAN Is Nothing Then
' CURRENT_SCAN_FOLDERWATCH = folderwatch_SCAN
@@ -189,10 +188,10 @@ Public Class ClassInit
' ClassFolderWatcher.StartStop_FolderWatchSCAN()
' End If
' Else
' ClassLogger.Add("Init_Folderwatch: folderwatch_SCAN path is nothing!", True)
' LOGGER.Info("Init_Folderwatch: folderwatch_SCAN path is nothing!")
' End If
'Catch ex As Exception
' ClassLogger.Add("Unexpected Error in Init_Folderwatch: " & ex.Message, True)
' LOGGER.Info("Unexpected Error in Init_Folderwatch: " & ex.Message)
' START_INCOMPLETE = True
'End Try
End Sub
@@ -200,13 +199,14 @@ Public Class ClassInit
Try
Dim sql = "SELECT MAX(GUID) FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('@user'))"
sql = sql.Replace("@user", Environment.UserName)
' ClassLogger.Add(">> Username: " & Environment.UserName, False)
' LOGGER.Info(">> Username: " & Environment.UserName)
USER_ID = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
Try
Dim USERID = CInt(USER_ID)
Catch ex As Exception
ClassLogger.Add("User '" & Environment.UserName & "' not configured in Useradministration! (DBNull)", True)
LOGGER.Info("User '" & Environment.UserName & "' not configured in Useradministration! (DBNull)")
LOGGER.Error(ex.Message)
'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
'Me.Close()
START_INCOMPLETE = True
@@ -228,7 +228,7 @@ Public Class ClassInit
sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','GLOBIX',{1})", Environment.UserName, 1)
Dim DT_CHECKUSER_MODULE As DataTable = ClassDatabase.Return_Datatable(sql)
If DT_CHECKUSER_MODULE.Rows.Count = 0 Then
ClassLogger.Add("DT_CHECKUSER_MODULE.Rows.Count = 0", True)
LOGGER.Info("DT_CHECKUSER_MODULE.Rows.Count = 0")
START_INCOMPLETE = True
ERROR_STATE = "NO USER"
MsgBox("Sorry - Something went wrong in getting Your rights." & vbNewLine & "Please contact the system administrator!", MsgBoxStyle.Exclamation)
@@ -237,7 +237,7 @@ Public Class ClassInit
If DT_CHECKUSER_MODULE.Rows.Count = 1 Then
USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS")
If USER_IN_MODULE = False Then
ClassLogger.Add(" - User: " & Environment.UserName & " nicht für Modul freigegben!", False)
LOGGER.Info(" - User: " & Environment.UserName & " nicht für Modul freigegben!")
START_INCOMPLETE = True
Throw New Exception("Your user is not allowed to use this module." & vbNewLine & "Please contact the system administrator!")
@@ -265,17 +265,17 @@ Public Class ClassInit
ClassDatabase.Execute_non_Query(sql)
sql = "SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE Upper(MODULE) = UPPER('Global-Indexer')"
Dim anzahl = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
If LogErrorsOnly = False Then ClassLogger.Add(" >> Anzahl Angemeldete User: " & anzahl.ToString, False)
LOGGER.Info(" >> Anzahl Angemeldete User: " & anzahl.ToString)
UserLoggedin = CInt(anzahl)
UserLoggedin += 1
If LICENSE_COUNT < UserLoggedin And LICENSE_EXPIRED = False Then
MsgBox("Die Anzahl der aktuell angemeldeten User (" & UserLoggedin.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
ClassLogger.Add(" >> Die Anzahl der aktuell angemeldeten User (" & UserLoggedin.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für Global Indexer!", False)
LOGGER.Info(" >> Die Anzahl der aktuell angemeldeten User (" & UserLoggedin.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für Global Indexer!")
If USER_IS_ADMIN = False Then
'Anmeldung wieder herausnehmen
sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE= 'Global-Indexer'"
ClassDatabase.Execute_non_Query(sql, True)
ClassLogger.Add(" - Wieder abgemeldet", False)
LOGGER.Info(" - Wieder abgemeldet")
START_INCOMPLETE = True
End If
End If
@@ -286,7 +286,8 @@ Public Class ClassInit
Catch ex As Exception
ClassLogger.Add("Unexpected Error in InitUserLogin: " & ex.Message, True)
LOGGER.Info("Unexpected Error in InitUserLogin: " & ex.Message)
LOGGER.Error(ex.message)
MsgBox(ex.Message, MsgBoxStyle.Critical)
START_INCOMPLETE = True
End Try