ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'opensim:master' into master

Browse Source
This commit is contained in:
Adil El Farissi
2024-10-23 01:31:28 +00:00
committed by GitHub
parent a4b5986271 3506134ede
commit e306a1c1de
3 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@@ -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);
}

2
OpenSim/Framework/WebUtil.cs
View File

@@ -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] + "...";

2
OpenSim/Services/Base/ServiceBase.cs
View File

@@ -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;
}