From 45372514c2aebd096581b8448f2edf392236008e Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 16 Oct 2024 23:32:05 +0100 Subject: [PATCH 1/4] remove old bad code --- .../Framework/Servers/HttpServer/BaseHttpServer.cs | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 153acdf27a..d90b5e0b88 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs @@ -831,17 +831,6 @@ namespace OpenSim.Framework.Servers.HttpServer if (WebUtil.DebugLevel >= 5) { string output = System.Text.Encoding.UTF8.GetString(buffer); - - if (WebUtil.DebugLevel >= 6) - { - // Always truncate binary blobs. We don't have a ContentType, so detect them using the request name. - if (requestHandler is not null && requestHandler.Name.Equals("GetMesh")) - { - if (output.Length > WebUtil.MaxRequestDiagLength) - output = string.Concat(output.AsSpan(0, WebUtil.MaxRequestDiagLength), "..."); - } - } - WebUtil.LogResponseDetail(RequestNumber, output); } From 3f70e493b089978d84fb2cf6a75dd3e33b894b8d Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 16 Oct 2024 23:46:34 +0100 Subject: [PATCH 2/4] fix LogOutgoingDetail output length limit --- OpenSim/Framework/WebUtil.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index 1a9d9cc1e5..744e732e44 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs @@ -333,7 +333,7 @@ namespace OpenSim.Framework [MethodImpl(MethodImplOptions.AggressiveInlining)] public static void LogOutgoingDetail(string context, string output) { - if (DebugLevel == 5) + if (DebugLevel >= 5) { if (output.Length > MaxRequestDiagLength) output = output[..MaxRequestDiagLength] + "..."; From 1ba9257650c4c356a70a48fd016bc77bbe571556 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 20 Oct 2024 00:06:50 +0100 Subject: [PATCH 3/4] fix typo --- OpenSim/Services/Base/ServiceBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Services/Base/ServiceBase.cs b/OpenSim/Services/Base/ServiceBase.cs index f75d2a222b..8e5300b8f4 100644 --- a/OpenSim/Services/Base/ServiceBase.cs +++ b/OpenSim/Services/Base/ServiceBase.cs @@ -104,7 +104,7 @@ namespace OpenSim.Services.Base "[SERVICE BASE]: Failed to load plugin {0} from {1} with args {2}", interfaceName, dllName, string.Join(", ", strArgs.ToArray()), e); if (e.InnerException != null) - m_log.Error($"\"[SERVICE BASE]: inner expection {e.InnerException.Message}"); + m_log.Error($"[SERVICE BASE]: inner expection {e.InnerException.Message}"); return null; } From 3506134ede3cf69e7ed562adf38a66c04f2512c4 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 21 Oct 2024 20:28:08 +0100 Subject: [PATCH 4/4] fix typo --- OpenSim/Services/Base/ServiceBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Services/Base/ServiceBase.cs b/OpenSim/Services/Base/ServiceBase.cs index 8e5300b8f4..310ccfac47 100644 --- a/OpenSim/Services/Base/ServiceBase.cs +++ b/OpenSim/Services/Base/ServiceBase.cs @@ -104,7 +104,7 @@ namespace OpenSim.Services.Base "[SERVICE BASE]: Failed to load plugin {0} from {1} with args {2}", interfaceName, dllName, string.Join(", ", strArgs.ToArray()), e); if (e.InnerException != null) - m_log.Error($"[SERVICE BASE]: inner expection {e.InnerException.Message}"); + m_log.Error($"[SERVICE BASE]: inner exception {e.InnerException.Message}"); return null; }