diff options
author | Justin Clark-Casey (justincc) | 2010-10-30 01:32:56 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-30 01:32:56 +0100 |
commit | ade71c9ed7ce45b4acb1456df457fe94ad46bd23 (patch) | |
tree | 64392fc2ff23be656e3665dd4ff3023e4157a5da /OpenSim/Services/Connectors/Simulation | |
parent | tweak a few more scene presence logging messages for consistency (diff) | |
download | opensim-SC_OLD-ade71c9ed7ce45b4acb1456df457fe94ad46bd23.zip opensim-SC_OLD-ade71c9ed7ce45b4acb1456df457fe94ad46bd23.tar.gz opensim-SC_OLD-ade71c9ed7ce45b4acb1456df457fe94ad46bd23.tar.bz2 opensim-SC_OLD-ade71c9ed7ce45b4acb1456df457fe94ad46bd23.tar.xz |
Change level of some logging messages, turning some info into arguably more appropriate debug to reduce console spam when log level is info
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index a5f748f..502fc82 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -117,7 +117,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
117 | } | 117 | } |
118 | catch (Exception e) | 118 | catch (Exception e) |
119 | { | 119 | { |
120 | m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent create. Reason: " + e.Message); | 120 | m_log.Error("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent create. Reason: " + e.Message); |
121 | reason = e.Message; | 121 | reason = e.Message; |
122 | return false; | 122 | return false; |
123 | } | 123 | } |
@@ -158,13 +158,13 @@ namespace OpenSim.Services.Connectors.Simulation | |||
158 | AgentCreateRequest.ContentLength = buffer.Length; //Count bytes to send | 158 | AgentCreateRequest.ContentLength = buffer.Length; //Count bytes to send |
159 | os = AgentCreateRequest.GetRequestStream(); | 159 | os = AgentCreateRequest.GetRequestStream(); |
160 | os.Write(buffer, 0, strBuffer.Length); //Send it | 160 | os.Write(buffer, 0, strBuffer.Length); //Send it |
161 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Posted CreateAgent request to remote sim {0}, region {1}, x={2} y={3}", | 161 | m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: Posted CreateAgent request to remote sim {0}, region {1}, x={2} y={3}", |
162 | uri, destination.RegionName, destination.RegionLocX, destination.RegionLocY); | 162 | uri, destination.RegionName, destination.RegionLocX, destination.RegionLocY); |
163 | } | 163 | } |
164 | //catch (WebException ex) | 164 | //catch (WebException ex) |
165 | catch | 165 | catch |
166 | { | 166 | { |
167 | //m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Bad send on ChildAgentUpdate {0}", ex.Message); | 167 | //m_log.ErrorFormat("[REMOTE SIMULATION CONNECTOR]: Bad send on ChildAgentUpdate {0}", ex.Message); |
168 | reason = "cannot contact remote region"; | 168 | reason = "cannot contact remote region"; |
169 | return false; | 169 | return false; |
170 | } | 170 | } |
@@ -191,19 +191,19 @@ namespace OpenSim.Services.Connectors.Simulation | |||
191 | webResponse = AgentCreateRequest.GetResponse(); | 191 | webResponse = AgentCreateRequest.GetResponse(); |
192 | if (webResponse == null) | 192 | if (webResponse == null) |
193 | { | 193 | { |
194 | m_log.Info("[REMOTE SIMULATION CONNECTOR]: Null reply on DoCreateChildAgentCall post"); | 194 | m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Null reply on DoCreateChildAgentCall post"); |
195 | } | 195 | } |
196 | else | 196 | else |
197 | { | 197 | { |
198 | 198 | ||
199 | sr = new StreamReader(webResponse.GetResponseStream()); | 199 | sr = new StreamReader(webResponse.GetResponseStream()); |
200 | response = sr.ReadToEnd().Trim(); | 200 | response = sr.ReadToEnd().Trim(); |
201 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: DoCreateChildAgentCall reply was {0} ", response); | 201 | m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: DoCreateChildAgentCall reply was {0} ", response); |
202 | } | 202 | } |
203 | } | 203 | } |
204 | catch (WebException ex) | 204 | catch (WebException ex) |
205 | { | 205 | { |
206 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of DoCreateChildAgentCall {0}", ex.Message); | 206 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of DoCreateChildAgentCall {0}", ex.Message); |
207 | reason = "Destination did not reply"; | 207 | reason = "Destination did not reply"; |
208 | return string.Empty; | 208 | return string.Empty; |
209 | } | 209 | } |
@@ -231,7 +231,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
231 | } | 231 | } |
232 | catch (NullReferenceException e) | 232 | catch (NullReferenceException e) |
233 | { | 233 | { |
234 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of DoCreateChildAgentCall {0}", e.Message); | 234 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of DoCreateChildAgentCall {0}", e.Message); |
235 | 235 | ||
236 | // check for old style response | 236 | // check for old style response |
237 | if (response.ToLower().StartsWith("true")) | 237 | if (response.ToLower().StartsWith("true")) |
@@ -251,7 +251,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
251 | } | 251 | } |
252 | catch (Exception e) | 252 | catch (Exception e) |
253 | { | 253 | { |
254 | m_log.Debug("[REMOTE SIMULATION CONNECTOR]: PackAgentCircuitData failed with exception: " + e.Message); | 254 | m_log.Warn("[REMOTE SIMULATION CONNECTOR]: PackAgentCircuitData failed with exception: " + e.Message); |
255 | return null; | 255 | return null; |
256 | } | 256 | } |
257 | // Add the input arguments | 257 | // Add the input arguments |
@@ -284,7 +284,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
284 | } | 284 | } |
285 | catch (Exception e) | 285 | catch (Exception e) |
286 | { | 286 | { |
287 | m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent update. Reason: " + e.Message); | 287 | m_log.Warn("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent update. Reason: " + e.Message); |
288 | return false; | 288 | return false; |
289 | } | 289 | } |
290 | //Console.WriteLine(" >>> DoAgentUpdateCall <<< " + uri); | 290 | //Console.WriteLine(" >>> DoAgentUpdateCall <<< " + uri); |
@@ -303,7 +303,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
303 | } | 303 | } |
304 | catch (Exception e) | 304 | catch (Exception e) |
305 | { | 305 | { |
306 | m_log.Debug("[REMOTE SIMULATION CONNECTOR]: PackUpdateMessage failed with exception: " + e.Message); | 306 | m_log.Warn("[REMOTE SIMULATION CONNECTOR]: PackUpdateMessage failed with exception: " + e.Message); |
307 | } | 307 | } |
308 | // Add the input arguments | 308 | // Add the input arguments |
309 | args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString()); | 309 | args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString()); |
@@ -332,12 +332,12 @@ namespace OpenSim.Services.Connectors.Simulation | |||
332 | ChildUpdateRequest.ContentLength = buffer.Length; //Count bytes to send | 332 | ChildUpdateRequest.ContentLength = buffer.Length; //Count bytes to send |
333 | os = ChildUpdateRequest.GetRequestStream(); | 333 | os = ChildUpdateRequest.GetRequestStream(); |
334 | os.Write(buffer, 0, strBuffer.Length); //Send it | 334 | os.Write(buffer, 0, strBuffer.Length); //Send it |
335 | //m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Posted AgentUpdate request to remote sim {0}", uri); | 335 | //m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: Posted AgentUpdate request to remote sim {0}", uri); |
336 | } | 336 | } |
337 | catch (WebException ex) | 337 | catch (WebException ex) |
338 | //catch | 338 | //catch |
339 | { | 339 | { |
340 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Bad send on AgentUpdate {0}", ex.Message); | 340 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: Bad send on AgentUpdate {0}", ex.Message); |
341 | 341 | ||
342 | return false; | 342 | return false; |
343 | } | 343 | } |
@@ -348,7 +348,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
348 | } | 348 | } |
349 | 349 | ||
350 | // Let's wait for the response | 350 | // Let's wait for the response |
351 | //m_log.Info("[REMOTE SIMULATION CONNECTOR]: Waiting for a reply after ChildAgentUpdate"); | 351 | //m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Waiting for a reply after ChildAgentUpdate"); |
352 | 352 | ||
353 | WebResponse webResponse = null; | 353 | WebResponse webResponse = null; |
354 | StreamReader sr = null; | 354 | StreamReader sr = null; |
@@ -357,19 +357,19 @@ namespace OpenSim.Services.Connectors.Simulation | |||
357 | webResponse = ChildUpdateRequest.GetResponse(); | 357 | webResponse = ChildUpdateRequest.GetResponse(); |
358 | if (webResponse == null) | 358 | if (webResponse == null) |
359 | { | 359 | { |
360 | m_log.Info("[REMOTE SIMULATION CONNECTOR]: Null reply on ChilAgentUpdate post"); | 360 | m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Null reply on ChilAgentUpdate post"); |
361 | } | 361 | } |
362 | 362 | ||
363 | sr = new StreamReader(webResponse.GetResponseStream()); | 363 | sr = new StreamReader(webResponse.GetResponseStream()); |
364 | //reply = sr.ReadToEnd().Trim(); | 364 | //reply = sr.ReadToEnd().Trim(); |
365 | sr.ReadToEnd().Trim(); | 365 | sr.ReadToEnd().Trim(); |
366 | sr.Close(); | 366 | sr.Close(); |
367 | //m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: ChilAgentUpdate reply was {0} ", reply); | 367 | //m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: ChilAgentUpdate reply was {0} ", reply); |
368 | 368 | ||
369 | } | 369 | } |
370 | catch (WebException ex) | 370 | catch (WebException ex) |
371 | { | 371 | { |
372 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of ChilAgentUpdate from {0}: {1}", uri, ex.Message); | 372 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of ChilAgentUpdate from {0}: {1}", uri, ex.Message); |
373 | // ignore, really | 373 | // ignore, really |
374 | } | 374 | } |
375 | finally | 375 | finally |
@@ -401,7 +401,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
401 | webResponse = (HttpWebResponse)request.GetResponse(); | 401 | webResponse = (HttpWebResponse)request.GetResponse(); |
402 | if (webResponse == null) | 402 | if (webResponse == null) |
403 | { | 403 | { |
404 | m_log.Info("[REMOTE SIMULATION CONNECTOR]: Null reply on agent get "); | 404 | m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Null reply on agent get "); |
405 | } | 405 | } |
406 | 406 | ||
407 | sr = new StreamReader(webResponse.GetResponseStream()); | 407 | sr = new StreamReader(webResponse.GetResponseStream()); |
@@ -412,7 +412,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
412 | } | 412 | } |
413 | catch (WebException ex) | 413 | catch (WebException ex) |
414 | { | 414 | { |
415 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of agent get {0}", ex.Message); | 415 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of agent get {0}", ex.Message); |
416 | // ignore, really | 416 | // ignore, really |
417 | return false; | 417 | return false; |
418 | } | 418 | } |
@@ -453,7 +453,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
453 | WebResponse webResponse = request.GetResponse(); | 453 | WebResponse webResponse = request.GetResponse(); |
454 | if (webResponse == null) | 454 | if (webResponse == null) |
455 | { | 455 | { |
456 | m_log.Info("[REMOTE SIMULATION CONNECTOR]: Null reply on ReleaseAgent"); | 456 | m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Null reply on ReleaseAgent"); |
457 | } | 457 | } |
458 | 458 | ||
459 | sr = new StreamReader(webResponse.GetResponseStream()); | 459 | sr = new StreamReader(webResponse.GetResponseStream()); |
@@ -465,7 +465,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
465 | } | 465 | } |
466 | catch (WebException ex) | 466 | catch (WebException ex) |
467 | { | 467 | { |
468 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of ReleaseAgent {0}", ex.Message); | 468 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of ReleaseAgent {0}", ex.Message); |
469 | return false; | 469 | return false; |
470 | } | 470 | } |
471 | finally | 471 | finally |
@@ -486,7 +486,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
486 | } | 486 | } |
487 | catch (Exception e) | 487 | catch (Exception e) |
488 | { | 488 | { |
489 | m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent close. Reason: " + e.Message); | 489 | m_log.Warn("[REMOTE SIMULATION CONNECTOR]: Unable to resolve external endpoint on agent close. Reason: " + e.Message); |
490 | return false; | 490 | return false; |
491 | } | 491 | } |
492 | 492 | ||
@@ -502,7 +502,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
502 | WebResponse webResponse = request.GetResponse(); | 502 | WebResponse webResponse = request.GetResponse(); |
503 | if (webResponse == null) | 503 | if (webResponse == null) |
504 | { | 504 | { |
505 | m_log.Info("[REMOTE SIMULATION CONNECTOR]: Null reply on agent delete "); | 505 | m_log.Debug("[REMOTE SIMULATION CONNECTOR]: Null reply on agent delete "); |
506 | } | 506 | } |
507 | 507 | ||
508 | sr = new StreamReader(webResponse.GetResponseStream()); | 508 | sr = new StreamReader(webResponse.GetResponseStream()); |
@@ -514,7 +514,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
514 | } | 514 | } |
515 | catch (WebException ex) | 515 | catch (WebException ex) |
516 | { | 516 | { |
517 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of agent delete from {0}: {1}", destination.RegionName, ex.Message); | 517 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of agent delete from {0}: {1}", destination.RegionName, ex.Message); |
518 | return false; | 518 | return false; |
519 | } | 519 | } |
520 | finally | 520 | finally |
@@ -579,11 +579,11 @@ namespace OpenSim.Services.Connectors.Simulation | |||
579 | ObjectCreateRequest.ContentLength = buffer.Length; //Count bytes to send | 579 | ObjectCreateRequest.ContentLength = buffer.Length; //Count bytes to send |
580 | os = ObjectCreateRequest.GetRequestStream(); | 580 | os = ObjectCreateRequest.GetRequestStream(); |
581 | os.Write(buffer, 0, strBuffer.Length); //Send it | 581 | os.Write(buffer, 0, strBuffer.Length); //Send it |
582 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Posted CreateObject request to remote sim {0}", uri); | 582 | m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: Posted CreateObject request to remote sim {0}", uri); |
583 | } | 583 | } |
584 | catch (WebException ex) | 584 | catch (WebException ex) |
585 | { | 585 | { |
586 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: Bad send on CreateObject {0}", ex.Message); | 586 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: Bad send on CreateObject {0}", ex.Message); |
587 | return false; | 587 | return false; |
588 | } | 588 | } |
589 | finally | 589 | finally |
@@ -601,7 +601,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
601 | WebResponse webResponse = ObjectCreateRequest.GetResponse(); | 601 | WebResponse webResponse = ObjectCreateRequest.GetResponse(); |
602 | if (webResponse == null) | 602 | if (webResponse == null) |
603 | { | 603 | { |
604 | m_log.Info("[REMOTE SIMULATION CONNECTOR]: Null reply on CreateObject post"); | 604 | m_log.Warn("[REMOTE SIMULATION CONNECTOR]: Null reply on CreateObject post"); |
605 | return false; | 605 | return false; |
606 | } | 606 | } |
607 | 607 | ||
@@ -613,7 +613,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
613 | } | 613 | } |
614 | catch (WebException ex) | 614 | catch (WebException ex) |
615 | { | 615 | { |
616 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of CreateObject {0}", ex.Message); | 616 | m_log.WarnFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of CreateObject {0}", ex.Message); |
617 | return false; | 617 | return false; |
618 | } | 618 | } |
619 | finally | 619 | finally |