From 166de951b6fb5c840589f216cece1df1b5b4b06d Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 25 Jun 2026 01:46:21 +0200 Subject: [PATCH] LoggerUtils von Shared nach ServerUtils umgezogen (wegen Versionskonflikten von Log4Net) --- .../AICore/Facade/AiPromptsApiClient.cs | 1 + .../AICore/Facade/LLM/OllamaApiClient.cs | 1 + .../ServerUtils/ApiFacade/HttpClientFacade.cs | 3 +- .../ServerUtils/Core/LoggerUtils.cs | 30 +++++++++++++++++++ .../Components/ServerUtils/ServerUtils.csproj | 5 ++-- .../MultitenancyBehaviorExtension.cs | 3 +- .../JsonError/JsonErrorHandler.cs | 1 + .../WCFError/WCFErrorHandler.cs | 3 +- Shared/Core/LoggerUtils.cs | 30 ------------------- Shared/Shared.csproj | 4 --- 10 files changed, 41 insertions(+), 40 deletions(-) create mode 100644 Server/Components/ServerUtils/Core/LoggerUtils.cs delete mode 100644 Shared/Core/LoggerUtils.cs diff --git a/Server/Components/AICore/Facade/AiPromptsApiClient.cs b/Server/Components/AICore/Facade/AiPromptsApiClient.cs index aee937122..ed862f07e 100644 --- a/Server/Components/AICore/Facade/AiPromptsApiClient.cs +++ b/Server/Components/AICore/Facade/AiPromptsApiClient.cs @@ -12,6 +12,7 @@ using System.ComponentModel.Design; using System.Runtime.Remoting.Messaging; using log4net; using BS.Shared.Core; +using BeWo.ServerUtils.Core; namespace AICore.Facade { diff --git a/Server/Components/AICore/Facade/LLM/OllamaApiClient.cs b/Server/Components/AICore/Facade/LLM/OllamaApiClient.cs index bcbb187c8..18ec434aa 100644 --- a/Server/Components/AICore/Facade/LLM/OllamaApiClient.cs +++ b/Server/Components/AICore/Facade/LLM/OllamaApiClient.cs @@ -13,6 +13,7 @@ using BS.Shared.Logger; using log4net; using System.Runtime.CompilerServices; using BS.Shared.Core; +using BeWo.ServerUtils.Core; namespace AICore.Facade.LLM { diff --git a/Server/Components/ServerUtils/ApiFacade/HttpClientFacade.cs b/Server/Components/ServerUtils/ApiFacade/HttpClientFacade.cs index a7b725f3b..c81b5cb0b 100644 --- a/Server/Components/ServerUtils/ApiFacade/HttpClientFacade.cs +++ b/Server/Components/ServerUtils/ApiFacade/HttpClientFacade.cs @@ -1,4 +1,5 @@ -using BS.Shared.Core; +using BeWo.ServerUtils.Core; +using BS.Shared.Core; using BS.Shared.DataContracts; using BS.Shared.Exceptions; using BS.Shared.Interface; diff --git a/Server/Components/ServerUtils/Core/LoggerUtils.cs b/Server/Components/ServerUtils/Core/LoggerUtils.cs new file mode 100644 index 000000000..4b64645d9 --- /dev/null +++ b/Server/Components/ServerUtils/Core/LoggerUtils.cs @@ -0,0 +1,30 @@ +using log4net; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BeWo.ServerUtils.Core +{ + public static class LoggerUtils + { + private static bool _LoggerInit = false; + + public static void InitLogger() + { + if (_LoggerInit) return; + + log4net.Config.XmlConfigurator.Configure(); + + _LoggerInit = true; + } + + public static ILog GetLogger(Type declaringType) + { + InitLogger(); + + return log4net.LogManager.GetLogger(declaringType); + } + } +} diff --git a/Server/Components/ServerUtils/ServerUtils.csproj b/Server/Components/ServerUtils/ServerUtils.csproj index 6048f375d..2f9f32144 100644 --- a/Server/Components/ServerUtils/ServerUtils.csproj +++ b/Server/Components/ServerUtils/ServerUtils.csproj @@ -89,6 +89,7 @@ + @@ -98,9 +99,7 @@ - - - + {2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4} diff --git a/Service/Multitenancy/MultitenancyBehaviorExtension.cs b/Service/Multitenancy/MultitenancyBehaviorExtension.cs index ad07c34b0..616b43486 100644 --- a/Service/Multitenancy/MultitenancyBehaviorExtension.cs +++ b/Service/Multitenancy/MultitenancyBehaviorExtension.cs @@ -1,4 +1,5 @@ -using BS.Shared.Core; +using BeWo.ServerUtils.Core; +using BS.Shared.Core; using System; using System.ServiceModel.Configuration; diff --git a/Service/ServiceBehavior/JsonError/JsonErrorHandler.cs b/Service/ServiceBehavior/JsonError/JsonErrorHandler.cs index aba5e5ff3..9e95e81f9 100644 --- a/Service/ServiceBehavior/JsonError/JsonErrorHandler.cs +++ b/Service/ServiceBehavior/JsonError/JsonErrorHandler.cs @@ -1,4 +1,5 @@ using BeWo.Data.Access; +using BeWo.ServerUtils.Core; using BeWo.Service.Core; using BS.Shared.Core; using System; diff --git a/Service/ServiceBehavior/WCFError/WCFErrorHandler.cs b/Service/ServiceBehavior/WCFError/WCFErrorHandler.cs index 5eb4bb18a..326e4705d 100644 --- a/Service/ServiceBehavior/WCFError/WCFErrorHandler.cs +++ b/Service/ServiceBehavior/WCFError/WCFErrorHandler.cs @@ -1,4 +1,5 @@ -using BeWo.Service.Core; +using BeWo.ServerUtils.Core; +using BeWo.Service.Core; using BS.Shared.Core; using DevExpress.CodeParser.Diagnostics; using log4net; diff --git a/Shared/Core/LoggerUtils.cs b/Shared/Core/LoggerUtils.cs deleted file mode 100644 index 85e631dd6..000000000 --- a/Shared/Core/LoggerUtils.cs +++ /dev/null @@ -1,30 +0,0 @@ -using log4net; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BS.Shared.Core -{ - public static class LoggerUtils - { - private static bool _LoggerInit = false; - - public static void InitLogger() - { - if(_LoggerInit) return; - - log4net.Config.XmlConfigurator.Configure(); - - _LoggerInit = true; - } - - public static ILog GetLogger(Type declaringType) - { - InitLogger(); - - return log4net.LogManager.GetLogger(declaringType); - } - } -} diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj index 3adcce66d..a47933167 100644 --- a/Shared/Shared.csproj +++ b/Shared/Shared.csproj @@ -103,9 +103,6 @@ - - ..\Lib\log4net.dll - ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -152,7 +149,6 @@ -