From e50b6b5334270436ece8c2c5bdfe792395d044bf Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 20 Sep 2012 01:26:35 +0100
Subject: Update libopenjpeg libraries used by libopenmetaverse back up to 1.5,
this time using lkalif's linux libraries built against a much earlier libc
(2.7)
---
bin/lib32/libopenjpeg-dotnet.so | Bin 124540 -> 140028 bytes
bin/lib64/libopenjpeg-dotnet-x86_64.so | Bin 142616 -> 149368 bytes
bin/lib64/libopenjpeg-dotnet.dylib | Bin 125136 -> 147288 bytes
bin/openjpeg-dotnet-x86_64.dll | Bin 843776 -> 215040 bytes
bin/openjpeg-dotnet.dll | Bin 187392 -> 201216 bytes
5 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/bin/lib32/libopenjpeg-dotnet.so b/bin/lib32/libopenjpeg-dotnet.so
index 0106b56..193eca4 100755
Binary files a/bin/lib32/libopenjpeg-dotnet.so and b/bin/lib32/libopenjpeg-dotnet.so differ
diff --git a/bin/lib64/libopenjpeg-dotnet-x86_64.so b/bin/lib64/libopenjpeg-dotnet-x86_64.so
index be11bb4..7a9bdfc 100755
Binary files a/bin/lib64/libopenjpeg-dotnet-x86_64.so and b/bin/lib64/libopenjpeg-dotnet-x86_64.so differ
diff --git a/bin/lib64/libopenjpeg-dotnet.dylib b/bin/lib64/libopenjpeg-dotnet.dylib
index dc50775..18ca868 100755
Binary files a/bin/lib64/libopenjpeg-dotnet.dylib and b/bin/lib64/libopenjpeg-dotnet.dylib differ
diff --git a/bin/openjpeg-dotnet-x86_64.dll b/bin/openjpeg-dotnet-x86_64.dll
index 97729ff..9e8cd21 100755
Binary files a/bin/openjpeg-dotnet-x86_64.dll and b/bin/openjpeg-dotnet-x86_64.dll differ
diff --git a/bin/openjpeg-dotnet.dll b/bin/openjpeg-dotnet.dll
index 64b2557..6377b8d 100755
Binary files a/bin/openjpeg-dotnet.dll and b/bin/openjpeg-dotnet.dll differ
--
cgit v1.1
From f2a9d26118f87903564990ff220d642801767c25 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 20 Sep 2012 01:40:05 +0100
Subject: Make ResendAppearanceUpdates = true by default in [Appearance] in
OpenSimDefaults.ini.
This resends appearance uuids to avatars in the scene once a minute.
I have seen this help in the past resolve grey appearance problems where viewers have for unknown reasons sometimes ignored the packet.
The overhead is very small since only the UUIDs are sent - the viewer then requests the texture only if it does not have it cached.
This setting will not help with cloudy avatars which are usually due to the viewer not uploading baked texture data or uploading something that isn't valid JPEG2000
---
OpenSim/Region/Framework/Scenes/Scene.cs | 2 ++
bin/OpenSimDefaults.ini | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c873cdf..e9d1d42 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -861,6 +861,8 @@ namespace OpenSim.Region.Framework.Scenes
}
// FIXME: Ultimately this should be in a module.
+ SendPeriodicAppearanceUpdates = true;
+
IConfig appearanceConfig = m_config.Configs["Appearance"];
if (appearanceConfig != null)
{
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index ef4f578..315ffbe 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -673,8 +673,7 @@
; If true, avatar appearance information is resent to other avatars in the simulator every 60 seconds.
; This may help with some situations where avatars are persistently grey, though it will not help
; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others).
- ; This setting is experimental.
- ResendAppearanceUpdates = false
+ ResendAppearanceUpdates = true
[Attachments]
--
cgit v1.1
From a74167bb0684eb6977aef08247144dc0e4aa6b3f Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Wed, 19 Sep 2012 12:47:23 +0100
Subject: Documentation of OnPluginConsole
---
OpenSim/Region/Framework/Scenes/EventManager.cs | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index e1c9c8e..1025943 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -184,6 +184,22 @@ namespace OpenSim.Region.Framework.Scenes
public delegate void OnPluginConsoleDelegate(string[] args);
+ ///
+ /// Triggered after
+ /// has been called for all
+ /// loaded via .
+ /// Handlers for this event are typically used to parse the arguments
+ /// from in order to process or
+ /// filter the arguments and pass them onto
+ ///
+ ///
+ /// Triggered by in
+ /// via
+ /// via
+ /// via
+ /// via
+ ///
+ ///
public event OnPluginConsoleDelegate OnPluginConsole;
///
--
cgit v1.1
From 61f4523e01b11ac116ab0c1a86075126039f481b Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Wed, 19 Sep 2012 15:00:02 +0100
Subject: Documentation of object-related events
---
OpenSim/Region/Framework/Scenes/EventManager.cs | 39 ++++++++++++++++++++++++-
1 file changed, 38 insertions(+), 1 deletion(-)
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 1025943..7024bd6 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -238,12 +238,34 @@ namespace OpenSim.Region.Framework.Scenes
///
/// Fired when an object is touched/grabbed.
///
+ ///
/// The originalID is the local ID of the part that was actually touched. The localID itself is always that of
/// the root part.
+ /// Triggerd in response to
+ /// via
+ /// in
+ ///
public event ObjectGrabDelegate OnObjectGrab;
public delegate void ObjectGrabDelegate(uint localID, uint originalID, Vector3 offsetPos, IClientAPI remoteClient, SurfaceTouchEventArgs surfaceArgs);
+ ///
+ /// Triggered when an object is being touched/grabbed continuously.
+ ///
+ ///
+ /// Triggered in response to
+ /// via
+ /// in
+ ///
public event ObjectGrabDelegate OnObjectGrabbing;
+
+ ///
+ /// Triggered when an object stops being touched/grabbed.
+ ///
+ ///
+ /// Triggered in response to
+ /// via
+ /// in
+ ///
public event ObjectDeGrabDelegate OnObjectDeGrab;
public event ScriptResetDelegate OnScriptReset;
@@ -453,12 +475,27 @@ namespace OpenSim.Region.Framework.Scenes
///
/// Triggered when an object is added to the scene.
///
+ ///
+ /// Triggered by
+ /// in ,
+ /// ,
+ ///
+ ///
public event Action OnObjectAddedToScene;
///
- /// Triggered when an object is removed from the scene.
+ /// Delegate for
///
+ /// The object being removed from the scene
public delegate void ObjectBeingRemovedFromScene(SceneObjectGroup obj);
+
+ ///
+ /// Triggered when an object is removed from the scene.
+ ///
+ ///
+ /// Triggered by
+ /// in
+ ///
public event ObjectBeingRemovedFromScene OnObjectBeingRemovedFromScene;
public delegate void NoticeNoLandDataFromStorage();
--
cgit v1.1
From 49e2872f9ee3c5c11145a43ec91bac2dab324f42 Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Wed, 19 Sep 2012 20:26:57 +0100
Subject: Documentation of agent-related events
---
OpenSim/Region/Framework/Scenes/EventManager.cs | 35 ++++++++++++++++++++++++-
1 file changed, 34 insertions(+), 1 deletion(-)
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 7024bd6..48a85a2 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -214,6 +214,18 @@ namespace OpenSim.Region.Framework.Scenes
public delegate void OnSetRootAgentSceneDelegate(UUID agentID, Scene scene);
+ ///
+ /// Triggered before the grunt work for adding a root agent to a
+ /// scene has been performed (resuming attachment scripts, physics,
+ /// animations etc.)
+ ///
+ ///
+ /// Triggered before
+ /// by
+ /// in
+ /// via
+ /// and
+ ///
public event OnSetRootAgentSceneDelegate OnSetRootAgentScene;
///
@@ -429,15 +441,36 @@ namespace OpenSim.Region.Framework.Scenes
public event ScriptColliding OnScriptLandColliderEnd;
public delegate void OnMakeChildAgentDelegate(ScenePresence presence);
+
+ ///
+ /// Triggered when an agent has been made a child agent of a scene.
+ ///
+ ///
+ /// Triggered by
+ /// in
+ /// via ,
+ /// ,
+ ///
+ ///
public event OnMakeChildAgentDelegate OnMakeChildAgent;
public delegate void OnSaveNewWindlightProfileDelegate();
public delegate void OnSendNewWindlightProfileTargetedDelegate(RegionLightShareData wl, UUID user);
///
+ /// Triggered after the grunt work for adding a root agent to a
+ /// scene has been performed (resuming attachment scripts, physics,
+ /// animations etc.)
+ ///
+ ///
/// This event is on the critical path for transferring an avatar from one region to another. Try and do
/// as little work on this event as possible, or do work asynchronously.
- ///
+ /// Triggered after
+ /// by
+ /// in
+ /// via
+ /// and
+ ///
public event Action OnMakeRootAgent;
public event OnSendNewWindlightProfileTargetedDelegate OnSendNewWindlightProfileTargeted;
--
cgit v1.1
From 696b3f66c482aa6ee56b0a0d7cd3686a43e59503 Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Wed, 19 Sep 2012 20:27:52 +0100
Subject: minor tweaks to existing comments for IDE goodness
---
OpenSim/Region/Framework/Scenes/EventManager.cs | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 48a85a2..e415e09 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -496,9 +496,10 @@ namespace OpenSim.Region.Framework.Scenes
public event AvatarKillData OnAvatarKilled;
public delegate void AvatarKillData(uint KillerLocalID, ScenePresence avatar);
-// public delegate void ScriptTimerEvent(uint localID, double timerinterval);
-
-// public event ScriptTimerEvent OnScriptTimerEvent;
+ /*
+ public delegate void ScriptTimerEvent(uint localID, double timerinterval);
+ public event ScriptTimerEvent OnScriptTimerEvent;
+ */
public delegate void EstateToolsSunUpdate(ulong regionHandle, bool FixedTime, bool EstateSun, float LindenHour);
public delegate void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID);
@@ -724,7 +725,9 @@ namespace OpenSim.Region.Framework.Scenes
public UUID sender;
public UUID receiver;
- // Always false. The SL protocol sucks.
+ ///
+ /// Always false. The SL protocol sucks.
+ ///
public bool authenticated = false;
public int amount;
--
cgit v1.1
From d667f9d260808a27e91acf11244dded87517ec58 Mon Sep 17 00:00:00 2001
From: SignpostMarv
Date: Sat, 15 Sep 2012 17:32:10 +0100
Subject: Documentation of teleport-related events
---
OpenSim/Region/Framework/Scenes/EventManager.cs | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index e415e09..f079e00 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -715,9 +715,28 @@ namespace OpenSim.Region.Framework.Scenes
public event PrimsLoaded OnPrimsLoaded;
public delegate void TeleportStart(IClientAPI client, GridRegion destination, GridRegion finalDestination, uint teleportFlags, bool gridLogout);
+
+ ///
+ /// Triggered when a teleport starts
+ ///
+ ///
+ /// Triggered by
+ /// in
+ /// and
+ /// via
+ ///
public event TeleportStart OnTeleportStart;
public delegate void TeleportFail(IClientAPI client, bool gridLogout);
+
+ ///
+ /// Trigered when a teleport fails.
+ ///
+ ///
+ /// Triggered by
+ /// in
+ /// via
+ ///
public event TeleportFail OnTeleportFail;
public class MoneyTransferArgs : EventArgs
--
cgit v1.1
From b481a782341b721b14f30108b411a580e5f8651e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 20 Sep 2012 02:01:01 +0100
Subject: Don't fail to create an IRC nick if nick randomization is disabled in
the IRC module.
Patch from http://opensimulator.org/mantis/view.php?id=6293
Thanks Starflower.
---
OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
index ca956fb..a014798 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCConnector.cs
@@ -231,12 +231,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
if (m_server == null || m_baseNick == null || m_ircChannel == null || m_user == null)
throw new Exception("Invalid connector configuration");
- // Generate an initial nickname if randomizing is enabled
+ // Generate an initial nickname
if (m_randomizeNick)
- {
m_nick = m_baseNick + Util.RandomClass.Next(1, 99);
- }
+ else
+ m_nick = m_baseNick;
m_log.InfoFormat("[IRC-Connector-{0}]: Initialization complete", idn);
--
cgit v1.1
From 387a1bb283c0c55178421f2c28b0d28a24dac7a1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 20 Sep 2012 22:36:47 +0100
Subject: Add ability to turn on/off logging of outgoing HTTP requests flowing
through WebUtil.
This is for debugging purposes.
This is controlled via the "debug http" command which can already log incoming requests.
This now gains a mandatory parameter of in, out or all to control what is logged.
Log messages are also shortened and labelled and HTTP IN or HTTP OUT to be consistent with existing UDP PACKET IN and PACKET OUT messages.
---
.../Framework/Servers/HttpServer/BaseHttpServer.cs | 10 +--
OpenSim/Framework/Servers/MainServer.cs | 87 ++++++++++++++++------
OpenSim/Framework/WebUtil.cs | 41 ++++++++--
3 files changed, 103 insertions(+), 35 deletions(-)
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 43a19fa..f93b3dd 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -529,7 +529,7 @@ namespace OpenSim.Framework.Servers.HttpServer
if (DebugLevel >= 3)
m_log.DebugFormat(
- "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
+ "[BASE HTTP SERVER]: HTTP IN {0} content type handler {1} {2}",
request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
buffer = HandleHTTPRequest(request, response);
@@ -541,7 +541,7 @@ namespace OpenSim.Framework.Servers.HttpServer
if (DebugLevel >= 3)
m_log.DebugFormat(
- "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
+ "[BASE HTTP SERVER]: HTTP IN {0} content type handler {1} {2}",
request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
buffer = HandleLLSDRequests(request, response);
@@ -649,7 +649,7 @@ namespace OpenSim.Framework.Servers.HttpServer
private void LogIncomingToStreamHandler(OSHttpRequest request, IRequestHandler requestHandler)
{
m_log.DebugFormat(
- "[BASE HTTP SERVER]: Found stream handler for {0} {1} {2} {3}",
+ "[BASE HTTP SERVER]: HTTP IN stream handler {0} {1} {2} {3}",
request.HttpMethod, request.Url.PathAndQuery, requestHandler.Name, requestHandler.Description);
if (DebugLevel >= 4)
@@ -659,7 +659,7 @@ namespace OpenSim.Framework.Servers.HttpServer
private void LogIncomingToContentTypeHandler(OSHttpRequest request)
{
m_log.DebugFormat(
- "[BASE HTTP SERVER]: Found a {0} content type handler for {1} {2}",
+ "[BASE HTTP SERVER]: HTTP IN {0} content type handler {1} {2}",
request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
if (DebugLevel >= 4)
@@ -669,7 +669,7 @@ namespace OpenSim.Framework.Servers.HttpServer
private void LogIncomingToXmlRpcHandler(OSHttpRequest request)
{
m_log.DebugFormat(
- "[BASE HTTP SERVER]: Assuming a generic XMLRPC request for {0} {1}",
+ "[BASE HTTP SERVER]: HTTP IN assumed generic XMLRPC request {0} {1}",
request.HttpMethod, request.Url.PathAndQuery);
if (DebugLevel >= 4)
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index 7402c73..b7a133e 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -48,9 +48,11 @@ namespace OpenSim.Framework.Servers
/// Control the printing of certain debug messages.
///
///
- /// If DebugLevel >= 1, then short warnings are logged when receiving bad input data.
- /// If DebugLevel >= 2, then long warnings are logged when receiving bad input data.
- /// If DebugLevel >= 3, then short notices about all incoming non-poll HTTP requests are logged.
+ /// If DebugLevel >= 1 then short warnings are logged when receiving bad input data.
+ /// If DebugLevel >= 2 then long warnings are logged when receiving bad input data.
+ /// If DebugLevel >= 3 then short notices about all incoming non-poll HTTP requests are logged.
+ /// If DebugLevel >= 4 then the start of the body of incoming non-poll HTTP requests will be logged.
+ /// If DebugLevel >= 5 then the entire body of incoming non-poll HTTP requests will be logged.
///
public static int DebugLevel
{
@@ -102,7 +104,6 @@ namespace OpenSim.Framework.Servers
get { return new Dictionary(m_Servers); }
}
-
public static void RegisterHttpConsoleCommands(ICommandConsole console)
{
console.Commands.AddCommand(
@@ -111,15 +112,18 @@ namespace OpenSim.Framework.Servers
"Show all registered http handlers", HandleShowHttpHandlersCommand);
console.Commands.AddCommand(
- "Debug", false, "debug http", "debug http []",
- "Turn on inbound non-poll http request debugging.",
- "If level <= 0, then no extra logging is done.\n"
- + "If level >= 1, then short warnings are logged when receiving bad input data.\n"
- + "If level >= 2, then long warnings are logged when receiving bad input data.\n"
- + "If level >= 3, then short notices about all incoming non-poll HTTP requests are logged.\n"
- + "If level >= 4, then a sample from the beginning of the incoming data is logged.\n"
- + "If level >= 5, then the entire incoming data is logged.\n"
- + "If no level is specified then the current level is returned.",
+ "Debug", false, "debug http", "debug http []",
+ "Turn on http request logging.",
+ "If in or all and\n"
+ + " level <= 0, then no extra logging is done.\n"
+ + " level >= 1, then short warnings are logged when receiving bad input data.\n"
+ + " level >= 2, then long warnings are logged when receiving bad input data.\n"
+ + " level >= 3, then short notices about all incoming non-poll HTTP requests are logged.\n"
+ + " level >= 4, then a sample from the beginning of the incoming data is logged.\n"
+ + " level >= 5, then the entire incoming data is logged.\n"
+ + " no level is specified then the current level is returned.\n\n"
+ + "If out or all and\n"
+ + " level >= 3. then short notices about all outgoing requests going through WebUtil are logged.\n",
HandleDebugHttpCommand);
}
@@ -127,24 +131,63 @@ namespace OpenSim.Framework.Servers
/// Turn on some debugging values for OpenSim.
///
///
- private static void HandleDebugHttpCommand(string module, string[] args)
+ private static void HandleDebugHttpCommand(string module, string[] cmdparams)
{
- if (args.Length == 3)
+ if (cmdparams.Length < 3)
{
+ MainConsole.Instance.Output("Usage: debug http 0..5");
+ return;
+ }
+
+ bool inReqs = false;
+ bool outReqs = false;
+ bool allReqs = false;
+
+ string subCommand = cmdparams[2];
+
+ if (subCommand == "in")
+ inReqs = true;
+ else if (subCommand == "out")
+ outReqs = true;
+ else
+ allReqs = true;
+
+ if (cmdparams.Length >= 4)
+ {
+ string rawNewDebug = cmdparams[3];
int newDebug;
- if (int.TryParse(args[2], out newDebug))
+
+ if (!int.TryParse(rawNewDebug, out newDebug))
+ {
+ MainConsole.Instance.OutputFormat("{0} is not a valid debug level", rawNewDebug);
+ return;
+ }
+
+ if (newDebug < 0 || newDebug > 5)
+ {
+ MainConsole.Instance.OutputFormat("{0} is outside the valid debug level range of 0..5", newDebug);
+ return;
+ }
+
+ if (allReqs || inReqs)
{
MainServer.DebugLevel = newDebug;
- MainConsole.Instance.OutputFormat("Debug http level set to {0}", newDebug);
+ MainConsole.Instance.OutputFormat("In debug level set to {0}", newDebug);
+ }
+
+ if (allReqs || outReqs)
+ {
+ WebUtil.DebugLevel = newDebug;
+ MainConsole.Instance.OutputFormat("Out debug level set to {0}", newDebug);
}
- }
- else if (args.Length == 2)
- {
- MainConsole.Instance.OutputFormat("Current debug http level is {0}", MainServer.DebugLevel);
}
else
{
- MainConsole.Instance.Output("Usage: debug http 0..5");
+ if (allReqs || inReqs)
+ MainConsole.Instance.OutputFormat("Current in debug level is {0}", MainServer.DebugLevel);
+
+ if (allReqs || outReqs)
+ MainConsole.Instance.OutputFormat("Current out debug level is {0}", WebUtil.DebugLevel);
}
}
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 2aa4af5..7c4e852 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -54,6 +54,14 @@ namespace OpenSim.Framework
MethodBase.GetCurrentMethod().DeclaringType);
///
+ /// Control the printing of certain debug messages.
+ ///
+ ///
+ /// If DebugLevel >= 3 then short notices about outgoing HTTP requests are logged.
+ ///
+ public static int DebugLevel { get; set; }
+
+ ///
/// Request number for diagnostic purposes.
///
public static int RequestNumber = 0;
@@ -146,7 +154,11 @@ namespace OpenSim.Framework
private static OSDMap ServiceOSDRequestWorker(string url, OSDMap data, string method, int timeout, bool compressed)
{
int reqnum = RequestNumber++;
- // m_log.DebugFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method);
+
+ if (DebugLevel >= 3)
+ m_log.DebugFormat(
+ "[WEB UTIL]: HTTP OUT {0} ServiceOSD {1} {2} (timeout {3}, compressed {4})",
+ reqnum, method, url, timeout, compressed);
string errorMessage = "unknown error";
int tickstart = Util.EnvironmentTickCount();
@@ -317,7 +329,11 @@ namespace OpenSim.Framework
{
int reqnum = RequestNumber++;
string method = (data != null && data["RequestMethod"] != null) ? data["RequestMethod"] : "unknown";
- // m_log.DebugFormat("[WEB UTIL]: <{0}> start form request for {1}, method {2}",reqnum,url,method);
+
+ if (DebugLevel >= 3)
+ m_log.DebugFormat(
+ "[WEB UTIL]: HTTP OUT {0} ServiceForm {1} {2} (timeout {3})",
+ reqnum, method, url, timeout);
string errorMessage = "unknown error";
int tickstart = Util.EnvironmentTickCount();
@@ -643,7 +659,6 @@ namespace OpenSim.Framework
///
public static string[] GetPreferredImageTypes(string accept)
{
-
if (accept == null || accept == string.Empty)
return new string[0];
@@ -695,13 +710,15 @@ namespace OpenSim.Framework
string requestUrl, TRequest obj, Action action)
{
int reqnum = WebUtil.RequestNumber++;
- // m_log.DebugFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method);
+
+ if (WebUtil.DebugLevel >= 3)
+ m_log.DebugFormat(
+ "[WEB UTIL]: HTTP OUT {0} AsynchronousRequestObject {1} {2}",
+ reqnum, verb, requestUrl);
int tickstart = Util.EnvironmentTickCount();
int tickdata = 0;
- // m_log.DebugFormat("[ASYNC REQUEST]: Starting {0} {1}", verb, requestUrl);
-
Type type = typeof(TRequest);
WebRequest request = WebRequest.Create(requestUrl);
@@ -882,7 +899,11 @@ namespace OpenSim.Framework
public static string MakeRequest(string verb, string requestUrl, string obj)
{
int reqnum = WebUtil.RequestNumber++;
- // m_log.DebugFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method);
+
+ if (WebUtil.DebugLevel >= 3)
+ m_log.DebugFormat(
+ "[WEB UTIL]: HTTP OUT {0} SynchronousRestForms {1} {2}",
+ reqnum, verb, requestUrl);
int tickstart = Util.EnvironmentTickCount();
int tickdata = 0;
@@ -998,7 +1019,11 @@ namespace OpenSim.Framework
public static TResponse MakeRequest(string verb, string requestUrl, TRequest obj)
{
int reqnum = WebUtil.RequestNumber++;
- // m_log.DebugFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method);
+
+ if (WebUtil.DebugLevel >= 3)
+ m_log.DebugFormat(
+ "[WEB UTIL]: HTTP OUT {0} SynchronousRestObject {1} {2}",
+ reqnum, verb, requestUrl);
int tickstart = Util.EnvironmentTickCount();
int tickdata = 0;
--
cgit v1.1
From a5b3989e5db0a3b22e44b84412227a8e487bcef2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 20 Sep 2012 23:18:19 +0100
Subject: Insert a new log level 4 for HTTP IN and HTTP OUT that will log how
long the request took.
This is only printed if debug http level >= 4 and the request didn't take more than the time considered 'long', in which case the existing log message is printed.
This displaces the previous log levels 4 and 5 which are now 5 and 6 respectively.
---
.../Framework/Servers/HttpServer/BaseHttpServer.cs | 47 ++++++++++++++-------
OpenSim/Framework/Servers/MainServer.cs | 48 ++++++++++++++--------
OpenSim/Framework/WebUtil.cs | 24 +++++++++++
3 files changed, 87 insertions(+), 32 deletions(-)
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index f93b3dd..4e04dd8 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -54,6 +54,12 @@ namespace OpenSim.Framework.Servers.HttpServer
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private HttpServerLogWriter httpserverlog = new HttpServerLogWriter();
+ ///
+ /// Gets or sets the debug level.
+ ///
+ ///
+ /// See MainServer.DebugLevel.
+ ///
public int DebugLevel { get; set; }
private volatile int NotSocketErrors = 0;
@@ -529,8 +535,8 @@ namespace OpenSim.Framework.Servers.HttpServer
if (DebugLevel >= 3)
m_log.DebugFormat(
- "[BASE HTTP SERVER]: HTTP IN {0} content type handler {1} {2}",
- request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
+ "[BASE HTTP SERVER]: HTTP IN {0} content type handler {1} {2} from {3}",
+ request.ContentType, request.HttpMethod, request.Url.PathAndQuery, request.RemoteIPEndPoint);
buffer = HandleHTTPRequest(request, response);
break;
@@ -541,8 +547,8 @@ namespace OpenSim.Framework.Servers.HttpServer
if (DebugLevel >= 3)
m_log.DebugFormat(
- "[BASE HTTP SERVER]: HTTP IN {0} content type handler {1} {2}",
- request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
+ "[BASE HTTP SERVER]: HTTP IN {0} content type handler {1} {2} from {3}",
+ request.ContentType, request.HttpMethod, request.Url.PathAndQuery, request.RemoteIPEndPoint);
buffer = HandleLLSDRequests(request, response);
break;
@@ -640,7 +646,18 @@ namespace OpenSim.Framework.Servers.HttpServer
uriString,
requestHandler != null ? requestHandler.Name : "",
requestHandler != null ? requestHandler.Description : "",
- request.RemoteIPEndPoint.ToString(),
+ request.RemoteIPEndPoint,
+ tickdiff);
+ }
+ else if (DebugLevel >= 4)
+ {
+ m_log.DebugFormat(
+ "[BASE HTTP SERVER]: HTTP IN {0} {1} {2} {3} from {4} took {5}ms",
+ requestMethod,
+ uriString,
+ requestHandler != null ? requestHandler.Name : "",
+ requestHandler != null ? requestHandler.Description : "",
+ request.RemoteIPEndPoint,
tickdiff);
}
}
@@ -649,30 +666,30 @@ namespace OpenSim.Framework.Servers.HttpServer
private void LogIncomingToStreamHandler(OSHttpRequest request, IRequestHandler requestHandler)
{
m_log.DebugFormat(
- "[BASE HTTP SERVER]: HTTP IN stream handler {0} {1} {2} {3}",
- request.HttpMethod, request.Url.PathAndQuery, requestHandler.Name, requestHandler.Description);
+ "[BASE HTTP SERVER]: HTTP IN stream handler {0} {1} {2} {3} from {4}",
+ request.HttpMethod, request.Url.PathAndQuery, requestHandler.Name, requestHandler.Description, request.RemoteIPEndPoint);
- if (DebugLevel >= 4)
+ if (DebugLevel >= 5)
LogIncomingInDetail(request);
}
private void LogIncomingToContentTypeHandler(OSHttpRequest request)
{
m_log.DebugFormat(
- "[BASE HTTP SERVER]: HTTP IN {0} content type handler {1} {2}",
- request.ContentType, request.HttpMethod, request.Url.PathAndQuery);
+ "[BASE HTTP SERVER]: HTTP IN {0} content type handler {1} {2} from {3}",
+ request.ContentType, request.HttpMethod, request.Url.PathAndQuery, request.RemoteIPEndPoint);
- if (DebugLevel >= 4)
+ if (DebugLevel >= 5)
LogIncomingInDetail(request);
}
private void LogIncomingToXmlRpcHandler(OSHttpRequest request)
{
m_log.DebugFormat(
- "[BASE HTTP SERVER]: HTTP IN assumed generic XMLRPC request {0} {1}",
- request.HttpMethod, request.Url.PathAndQuery);
+ "[BASE HTTP SERVER]: HTTP IN assumed generic XMLRPC request {0} {1} from {2}",
+ request.HttpMethod, request.Url.PathAndQuery, request.RemoteIPEndPoint);
- if (DebugLevel >= 4)
+ if (DebugLevel >= 5)
LogIncomingInDetail(request);
}
@@ -682,7 +699,7 @@ namespace OpenSim.Framework.Servers.HttpServer
{
string output;
- if (DebugLevel == 4)
+ if (DebugLevel == 5)
{
const int sampleLength = 80;
char[] sampleChars = new char[sampleLength];
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index b7a133e..72f9cce 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -51,8 +51,9 @@ namespace OpenSim.Framework.Servers
/// If DebugLevel >= 1 then short warnings are logged when receiving bad input data.
/// If DebugLevel >= 2 then long warnings are logged when receiving bad input data.
/// If DebugLevel >= 3 then short notices about all incoming non-poll HTTP requests are logged.
- /// If DebugLevel >= 4 then the start of the body of incoming non-poll HTTP requests will be logged.
- /// If DebugLevel >= 5 then the entire body of incoming non-poll HTTP requests will be logged.
+ /// If DebugLevel >= 4 then the time taken to fulfill the request is logged.
+ /// If DebugLevel >= 5 then the start of the body of incoming non-poll HTTP requests will be logged.
+ /// If DebugLevel >= 6 then the entire body of incoming non-poll HTTP requests will be logged.
///
public static int DebugLevel
{
@@ -115,15 +116,17 @@ namespace OpenSim.Framework.Servers
"Debug", false, "debug http", "debug http []",
"Turn on http request logging.",
"If in or all and\n"
- + " level <= 0, then no extra logging is done.\n"
- + " level >= 1, then short warnings are logged when receiving bad input data.\n"
- + " level >= 2, then long warnings are logged when receiving bad input data.\n"
- + " level >= 3, then short notices about all incoming non-poll HTTP requests are logged.\n"
- + " level >= 4, then a sample from the beginning of the incoming data is logged.\n"
- + " level >= 5, then the entire incoming data is logged.\n"
+ + " level <= 0 then no extra logging is done.\n"
+ + " level >= 1 then short warnings are logged when receiving bad input data.\n"
+ + " level >= 2 then long warnings are logged when receiving bad input data.\n"
+ + " level >= 3 then short notices about all incoming non-poll HTTP requests are logged.\n"
+ + " level >= 4 then the time taken to fulfill the request is logged.\n"
+ + " level >= 5 then a sample from the beginning of the incoming data is logged.\n"
+ + " level >= 6 then the entire incoming data is logged.\n"
+ " no level is specified then the current level is returned.\n\n"
+ "If out or all and\n"
- + " level >= 3. then short notices about all outgoing requests going through WebUtil are logged.\n",
+ + " level >= 3 then short notices about all outgoing requests going through WebUtil are logged.\n"
+ + " level >= 4 then the time taken to fulfill the request is logged.\n",
HandleDebugHttpCommand);
}
@@ -135,7 +138,7 @@ namespace OpenSim.Framework.Servers
{
if (cmdparams.Length < 3)
{
- MainConsole.Instance.Output("Usage: debug http 0..5");
+ MainConsole.Instance.Output("Usage: debug http 0..6");
return;
}
@@ -145,12 +148,23 @@ namespace OpenSim.Framework.Servers
string subCommand = cmdparams[2];
- if (subCommand == "in")
+ if (subCommand.ToLower() == "in")
+ {
inReqs = true;
- else if (subCommand == "out")
+ }
+ else if (subCommand.ToLower() == "out")
+ {
outReqs = true;
- else
+ }
+ else if (subCommand.ToLower() == "all")
+ {
allReqs = true;
+ }
+ else
+ {
+ MainConsole.Instance.Output("You must specify in, out or all");
+ return;
+ }
if (cmdparams.Length >= 4)
{
@@ -172,22 +186,22 @@ namespace OpenSim.Framework.Servers
if (allReqs || inReqs)
{
MainServer.DebugLevel = newDebug;
- MainConsole.Instance.OutputFormat("In debug level set to {0}", newDebug);
+ MainConsole.Instance.OutputFormat("IN debug level set to {0}", newDebug);
}
if (allReqs || outReqs)
{
WebUtil.DebugLevel = newDebug;
- MainConsole.Instance.OutputFormat("Out debug level set to {0}", newDebug);
+ MainConsole.Instance.OutputFormat("OUT debug level set to {0}", newDebug);
}
}
else
{
if (allReqs || inReqs)
- MainConsole.Instance.OutputFormat("Current in debug level is {0}", MainServer.DebugLevel);
+ MainConsole.Instance.OutputFormat("Current IN debug level is {0}", MainServer.DebugLevel);
if (allReqs || outReqs)
- MainConsole.Instance.OutputFormat("Current out debug level is {0}", WebUtil.DebugLevel);
+ MainConsole.Instance.OutputFormat("Current OUT debug level is {0}", WebUtil.DebugLevel);
}
}
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 7c4e852..64d61f1 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -250,6 +250,10 @@ namespace OpenSim.Framework
strBuffer != null
? (strBuffer.Length > MaxRequestDiagLength ? strBuffer.Remove(MaxRequestDiagLength) : strBuffer)
: "");
+ else if (DebugLevel >= 4)
+ m_log.DebugFormat(
+ "[WEB UTIL]: HTTP OUT {0} took {1}ms, {2}ms writing",
+ reqnum, tickdiff, tickdata);
}
m_log.DebugFormat(
@@ -405,6 +409,10 @@ namespace OpenSim.Framework
queryString != null
? (queryString.Length > MaxRequestDiagLength) ? queryString.Remove(MaxRequestDiagLength) : queryString
: "");
+ else if (DebugLevel >= 4)
+ m_log.DebugFormat(
+ "[WEB UTIL]: HTTP OUT {0} took {1}ms, {2}ms writing",
+ reqnum, tickdiff, tickdata);
}
m_log.WarnFormat("[SERVICE FORM]: <{0}> form request to {1} failed: {2}", reqnum, url, errorMessage);
@@ -879,6 +887,12 @@ namespace OpenSim.Framework
tickdata,
originalRequest);
}
+ else if (WebUtil.DebugLevel >= 4)
+ {
+ m_log.DebugFormat(
+ "[WEB UTIL]: HTTP OUT {0} took {1}ms, {2}ms writing",
+ reqnum, tickdiff, tickdata);
+ }
}
}
@@ -995,6 +1009,10 @@ namespace OpenSim.Framework
tickdiff,
tickdata,
obj.Length > WebUtil.MaxRequestDiagLength ? obj.Remove(WebUtil.MaxRequestDiagLength) : obj);
+ else if (WebUtil.DebugLevel >= 4)
+ m_log.DebugFormat(
+ "[WEB UTIL]: HTTP OUT {0} took {1}ms, {2}ms writing",
+ reqnum, tickdiff, tickdata);
return respstring;
}
@@ -1144,6 +1162,12 @@ namespace OpenSim.Framework
tickdata,
originalRequest);
}
+ else if (WebUtil.DebugLevel >= 4)
+ {
+ m_log.DebugFormat(
+ "[WEB UTIL]: HTTP OUT {0} took {1}ms, {2}ms writing",
+ reqnum, tickdiff, tickdata);
+ }
return deserial;
}
--
cgit v1.1