diff --git a/Data/Security/UserRightHelper.cs b/Data/Security/UserRightHelper.cs
index 801fafece..104f7e4ba 100644
--- a/Data/Security/UserRightHelper.cs
+++ b/Data/Security/UserRightHelper.cs
@@ -195,8 +195,8 @@ namespace BeWo.Data.Security
return "3.29";
if (isRightVersion330(r))
return "3.30";
- if (isRightVersion331(r))
- return "3.31";
+ if (isRightVersion3301(r))
+ return "3.30.1";
return BASE_VERSION;
}
@@ -245,7 +245,7 @@ namespace BeWo.Data.Security
|| r == UserRightType.AiVoiceView;
}
- private static bool isRightVersion331(UserRightType r)
+ private static bool isRightVersion3301(UserRightType r)
{
return r == UserRightType.AiModulePromptbausteinShare ||
r == UserRightType.AiModuleServiceRecordChat ||
diff --git a/Service/Core/BeWoServerPathHelper.cs b/Service/Core/BeWoServerPathHelper.cs
index 0b6d4421d..48e26d795 100644
--- a/Service/Core/BeWoServerPathHelper.cs
+++ b/Service/Core/BeWoServerPathHelper.cs
@@ -25,10 +25,6 @@ namespace BeWo.Service.Core
public static string GetServiceLogFile()
=> Path.Combine(getLogRootPath(), "service.log.txt");
- public static string GetWCFErrorLogFile()
- => Path.Combine(getLogRootPath(), "wcferror.log.txt");
- public static string GetJsonErrorLogFile()
- => Path.Combine(getLogRootPath(), "jsonerror.log.txt");
public static string GetApiServiceTestFile()
=> Path.Combine(getLogRootPath(), "apiservice.test.txt");
public static string GetAiServiceLogFile()
diff --git a/Service/Core/ServiceLogger.cs b/Service/Core/ServiceLogger.cs
index 8cefc1df2..06be8e14c 100644
--- a/Service/Core/ServiceLogger.cs
+++ b/Service/Core/ServiceLogger.cs
@@ -1,4 +1,6 @@
using BS.Shared.Logger;
+using DevExpress.CodeParser.Diagnostics;
+using log4net;
using System;
using System.Collections.Generic;
using System.IO;
@@ -11,10 +13,6 @@ namespace BeWo.Service.Core
public static class ServiceLogger
{
public static FileLogger CoreLogger { get; } = new FileLogger(BeWoServerPathHelper.GetServiceLogFile());
- public static FileLogger WCFErrorLogger { get; } = new FileLogger(BeWoServerPathHelper.GetWCFErrorLogFile());
- public static FileLogger JsonErrorLogger { get; } = new FileLogger(BeWoServerPathHelper.GetJsonErrorLogFile());
-
- //public static FileLogger AiLogger { get; } = new FileLogger(BeWoServerPathHelper.GetAiServiceLogFile());
public static FileLogger GetRequestLogger()
{
@@ -25,5 +23,12 @@ namespace BeWo.Service.Core
return new FileLogger(filePath);
}
+
+ public static ILog GetLogger(Type declaringType)
+ {
+ log4net.Config.XmlConfigurator.Configure();
+
+ return log4net.LogManager.GetLogger(declaringType);
+ }
}
}
diff --git a/Service/Plugins/AiPromptbausteineService.cs b/Service/Plugins/AiPromptbausteineService.cs
index 464897c93..c978104e2 100644
--- a/Service/Plugins/AiPromptbausteineService.cs
+++ b/Service/Plugins/AiPromptbausteineService.cs
@@ -10,6 +10,7 @@ using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts.Feature.AI;
using BS.Shared.Extensions;
+using DevExpress.CodeParser.Diagnostics;
using System;
using System.Collections.Generic;
using System.IO;
diff --git a/Service/Service.csproj b/Service/Service.csproj
index 53e99f143..c3f3f43b1 100644
--- a/Service/Service.csproj
+++ b/Service/Service.csproj
@@ -110,6 +110,10 @@
+
+ False
+ ..\Lib\log4net.dll
+
..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.7\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll
diff --git a/Service/ServiceBehavior/JsonError/JsonErrorHandler.cs b/Service/ServiceBehavior/JsonError/JsonErrorHandler.cs
index ed9a09871..8cb23ef87 100644
--- a/Service/ServiceBehavior/JsonError/JsonErrorHandler.cs
+++ b/Service/ServiceBehavior/JsonError/JsonErrorHandler.cs
@@ -30,10 +30,12 @@ namespace BeWo.Service.ServiceBehavior.JsonError
public class JsonErrorHandler : IErrorHandler
{
+ private static readonly log4net.ILog log = ServiceLogger.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
public void ProvideFault(Exception error, MessageVersion version, ref Message fault)
{
// Logge in File
- ServiceLogger.JsonErrorLogger.LogError(error);
+ log.Error(error);
// Erstelle eine JSON-Fehlermeldung
var jsonError = new JsonError
@@ -44,7 +46,7 @@ namespace BeWo.Service.ServiceBehavior.JsonError
// Fügt StackTrace hinzu (AppSettings)
string val = ConfigurationManager.AppSettings["AdminServiceEnableStackTrace"];
- if(bool.TryParse(val, out bool res) && res)
+ if (bool.TryParse(val, out bool res) && res)
{
jsonError.StackTrace = error.StackTrace;
}
diff --git a/Service/ServiceBehavior/WCFError/WCFErrorHandler.cs b/Service/ServiceBehavior/WCFError/WCFErrorHandler.cs
index d615ce977..483000045 100644
--- a/Service/ServiceBehavior/WCFError/WCFErrorHandler.cs
+++ b/Service/ServiceBehavior/WCFError/WCFErrorHandler.cs
@@ -1,4 +1,6 @@
using BeWo.Service.Core;
+using DevExpress.CodeParser.Diagnostics;
+using log4net;
using System;
using System.Collections.Generic;
using System.Configuration;
@@ -17,6 +19,8 @@ namespace BeWo.Service.ServiceBehavior.WCFError
{
public class WCFErrorHandler : IErrorHandler
{
+ private static readonly log4net.ILog log = ServiceLogger.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+
public bool HandleError(Exception exception)
{
return true;
@@ -25,7 +29,7 @@ namespace BeWo.Service.ServiceBehavior.WCFError
public void ProvideFault(Exception error, MessageVersion version, ref Message message)
{
// Logge in File
- ServiceLogger.WCFErrorLogger.LogError(error);
+ log.Error(error);
var wcfError = Utils.CreateBeWoFaultException(error);