OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleaned up debugging messages in the WebRequest handlers

viewer-2-initial-appearance
Mic Bowman 2011-01-03 17:16:22 -08:00
parent d3987024d7
commit e0da281e3d
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Framework/WebUtil.cs
View File

@ -146,7 +146,7 @@ namespace OpenSim.Framework
public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout) public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout)
{ {
int reqnum = m_requestNumber++; int reqnum = m_requestNumber++;
m_log.WarnFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method); m_log.DebugFormat("[WEB UTIL]: <{0}> start osd request for {1}, method {2}",reqnum,url,method);
string errorMessage = "unknown error"; string errorMessage = "unknown error";
int tickstart = Util.EnvironmentTickCount(); int tickstart = Util.EnvironmentTickCount();
@ -177,7 +177,7 @@ namespace OpenSim.Framework
{ {
string responseStr = null; string responseStr = null;
responseStr = responseStream.GetStreamString(); responseStr = responseStream.GetStreamString();
m_log.WarnFormat("[WEB UTIL]: <{0}> response is <{1}>",reqnum,responseStr); // m_log.DebugFormat("[WEB UTIL]: <{0}> response is <{1}>",reqnum,responseStr);
return CanonicalizeResults(responseStr); return CanonicalizeResults(responseStr);
} }
} }
@ -197,9 +197,11 @@ namespace OpenSim.Framework
} }
finally finally
{ {
// This just dumps a warning for any operation that takes more than 100 ms
int tickdiff = Util.EnvironmentTickCountSubtract(tickstart); int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
if (tickdiff > 100) if (tickdiff > 100)
m_log.WarnFormat("[WEB UTIL]: request <{0}> took {1} milliseconds",reqnum,tickdiff); m_log.WarnFormat("[WEB UTIL]: request <{0}> (URI:{1}, METHOD:{2}) took {3} milliseconds",
reqnum,url,method,tickdiff);
} }
m_log.WarnFormat("[WEB UTIL] <{0}> request failed: {1}",reqnum,errorMessage); m_log.WarnFormat("[WEB UTIL] <{0}> request failed: {1}",reqnum,errorMessage);
@ -260,7 +262,7 @@ namespace OpenSim.Framework
{ {
int reqnum = m_requestNumber++; int reqnum = m_requestNumber++;
string method = data["RequestMethod"] != null ? data["RequestMethod"] : "unknown"; string method = data["RequestMethod"] != null ? data["RequestMethod"] : "unknown";
m_log.WarnFormat("[WEB UTIL]: <{0}> start form request for {1}, method {2}",reqnum,url,method); m_log.DebugFormat("[WEB UTIL]: <{0}> start form request for {1}, method {2}",reqnum,url,method);
string errorMessage; string errorMessage;
int tickstart = Util.EnvironmentTickCount(); int tickstart = Util.EnvironmentTickCount();
@ -321,7 +323,8 @@ namespace OpenSim.Framework
{ {
int tickdiff = Util.EnvironmentTickCountSubtract(tickstart); int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
if (tickdiff > 100) if (tickdiff > 100)
m_log.WarnFormat("[WEB UTIL]: request <{0}> took {1} milliseconds",reqnum,tickdiff); m_log.WarnFormat("[WEB UTIL]: request <{0}> (URI:{1}, METHOD:{2}) took {3} milliseconds",
reqnum,url,method,tickdiff);
} }
m_log.WarnFormat("[WEB UTIL]: <{0}> request failed: {1}",reqnum,errorMessage); m_log.WarnFormat("[WEB UTIL]: <{0}> request failed: {1}",reqnum,errorMessage);

2
OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
View File

@ -283,7 +283,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string myipaddress, out string reason) public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string myipaddress, out string reason)
{ {
m_log.WarnFormat("[GATEKEEPER SERVICE CONNECTOR]: CreateAgent start"); // m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: CreateAgent start");
myipaddress = String.Empty; myipaddress = String.Empty;
reason = String.Empty; reason = String.Empty;

14
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
View File

@ -80,7 +80,7 @@ namespace OpenSim.Services.Connectors.Simulation
/// </summary> /// </summary>
public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason) public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason)
{ {
m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: CreateAgent start"); // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CreateAgent start");
reason = String.Empty; reason = String.Empty;
if (destination == null) if (destination == null)
@ -143,7 +143,7 @@ namespace OpenSim.Services.Connectors.Simulation
/// </summary> /// </summary>
private bool UpdateAgent(GridRegion destination, IAgentData cAgentData) private bool UpdateAgent(GridRegion destination, IAgentData cAgentData)
{ {
m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: UpdateAgent start"); // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: UpdateAgent start");
// Eventually, we want to use a caps url instead of the agentID // Eventually, we want to use a caps url instead of the agentID
string uri = destination.ServerURI + AgentPath() + cAgentData.AgentID + "/"; string uri = destination.ServerURI + AgentPath() + cAgentData.AgentID + "/";
@ -174,7 +174,7 @@ namespace OpenSim.Services.Connectors.Simulation
/// </summary> /// </summary>
public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent) public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent)
{ {
m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: RetrieveAgent start"); // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: RetrieveAgent start");
agent = null; agent = null;
@ -208,7 +208,7 @@ namespace OpenSim.Services.Connectors.Simulation
/// </summary> /// </summary>
public bool QueryAccess(GridRegion destination, UUID id) public bool QueryAccess(GridRegion destination, UUID id)
{ {
m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: QueryAccess start"); // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: QueryAccess start");
IPEndPoint ext = destination.ExternalEndPoint; IPEndPoint ext = destination.ExternalEndPoint;
if (ext == null) return false; if (ext == null) return false;
@ -233,7 +233,7 @@ namespace OpenSim.Services.Connectors.Simulation
/// </summary> /// </summary>
public bool ReleaseAgent(UUID origin, UUID id, string uri) public bool ReleaseAgent(UUID origin, UUID id, string uri)
{ {
m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: ReleaseAgent start"); // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: ReleaseAgent start");
try try
{ {
@ -251,7 +251,7 @@ namespace OpenSim.Services.Connectors.Simulation
/// </summary> /// </summary>
public bool CloseAgent(GridRegion destination, UUID id) public bool CloseAgent(GridRegion destination, UUID id)
{ {
m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start"); // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent start");
string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/"; string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/";
@ -281,7 +281,7 @@ namespace OpenSim.Services.Connectors.Simulation
/// </summary> /// </summary>
public bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall) public bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall)
{ {
m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: CreateObject start"); // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CreateObject start");
string uri = destination.ServerURI + ObjectPath() + sog.UUID + "/"; string uri = destination.ServerURI + ObjectPath() + sog.UUID + "/";