EDMI: fix API.Client constructor

Modules.EDMIAPI/Client.vb

@@ -43,8 +43,10 @@ Public Class Client
             Dim oBinding = Channel.GetBinding()
             Dim oAddress = New EndpointAddress($"net.tcp://{IPAddress}:{PortNumber}/DigitalData/Services/Main")
             Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress)
-        Catch ex As Exception
 
+            _channelFactory = oFactory
+        Catch ex As Exception
+            _logger.Error(ex)
         End Try
     End Sub
 

Modules.Logging/LogConfig.vb

@@ -66,14 +66,12 @@ Public Class LogConfig
     Private Const ARCHIVE_EVERY As FileArchivePeriod = FileArchivePeriod.Day
 
     Private Const FILE_NAME_FORMAT_DEFAULT As String = "${shortdate}-${var:product}${var:suffix}.log"
-    Private Const FILE_NAME_FORMAT_DETAIL As String = "${shortdate}-${var:product}${var:suffix}-Detail.log"
     Private Const FILE_NAME_FORMAT_DEBUG As String = "${shortdate}-${var:product}${var:suffix}-Debug.log"
     Private Const FILE_NAME_FORMAT_ERROR As String = "${shortdate}-${var:product}${var:suffix}-Error.log"
 
     Private Const TARGET_DEFAULT As String = "defaultTarget"
     Private Const TARGET_ERROR_EX As String = "errorExceptionTarget"
     Private Const TARGET_ERROR As String = "errorTarget"
-    Private Const TARGET_DETAIL As String = "detailTarget"
     Private Const TARGET_DEBUG As String = "debugTarget"
     Private Const TARGET_MEMORY As String = "memoryTarget"
 
@@ -82,10 +80,11 @@ Public Class LogConfig
 
     Private Const LOG_FORMAT_BASE As String = DATE_FORMAT_DEFAULT & "|${logger:shortName=True}|${level:uppercase=true}"
     Private Const LOG_FORMAT_BASE_LONG_DATE As String = DATE_FORMAT_LONG & "|${logger:shortName=True}|${level:uppercase=true}"
+    Private Const LOG_FORMAT_CALLSITE As String = "${callsite:className=false:fileName=true:includeSourcePath=false:methodName=true}"
 
     Private Const LOG_FORMAT_DEFAULT As String = LOG_FORMAT_BASE & " >> ${message}"
     Private Const LOG_FORMAT_EXCEPTION As String = LOG_FORMAT_BASE & " >> ${exception:format=Message}${newline}${exception:format=StackTrace}"
-    Private Const LOG_FORMAT_DEBUG As String = LOG_FORMAT_BASE_LONG_DATE & " >> ${message}"
+    Private Const LOG_FORMAT_DEBUG As String = LOG_FORMAT_BASE_LONG_DATE & " >> " & LOG_FORMAT_CALLSITE & " -> ${message}"
     Private Const LOG_FORMAT_MEMORY As String = LOG_FORMAT_BASE_LONG_DATE & " >> ${message}${newline}${exception:format=Message}${newline}${exception:format=StackTrace}"
 
     Private Const FILE_NAME_ACCESS_TEST = "accessTest.txt"
@@ -421,23 +420,11 @@ Public Class LogConfig
         Return errorLog
     End Function
 
-    Private Function GetDetailLogTarget(basePath As String) As FileTarget
-        Dim detailLog As New FileTarget() With {
-            .FileName = Path.Combine(basePath, FILE_NAME_FORMAT_DETAIL),
-            .Name = TARGET_DETAIL,
-            .Layout = LOG_FORMAT_DEFAULT,
-            .MaxArchiveFiles = MAX_ARCHIVE_FILES_DEBUG_DETAIL,
-            .ArchiveEvery = ARCHIVE_EVERY,
-            .KeepFileOpen = KEEP_FILES_OPEN
-        }
-
-        Return detailLog
-    End Function
     Private Function GetDebugLogTarget(basePath As String) As FileTarget
         Dim debugLog As New FileTarget() With {
             .FileName = Path.Combine(basePath, FILE_NAME_FORMAT_DEBUG),
             .Name = TARGET_DEBUG,
-            .Layout = LOG_FORMAT_DEFAULT,
+            .Layout = LOG_FORMAT_DEBUG,
             .MaxArchiveFiles = MAX_ARCHIVE_FILES_DEBUG_DETAIL,
             .ArchiveEvery = ARCHIVE_EVERY,
             .KeepFileOpen = KEEP_FILES_OPEN

Modules.Logging/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.0.0.1")>
+<Assembly: AssemblyVersion("2.0.1.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>