aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorBrian McBee2007-11-24 02:22:05 +0000
committerBrian McBee2007-11-24 02:22:05 +0000
commit2f4f83e3434a8171392519841991005a0a111a11 (patch)
tree322e47f093ff5879a999948ee037fb57ced83b22
parent* Hanling RequestGodlikePowers. On Request.. sends the sim owner's client the... (diff)
downloadopensim-SC_OLD-2f4f83e3434a8171392519841991005a0a111a11.zip
opensim-SC_OLD-2f4f83e3434a8171392519841991005a0a111a11.tar.gz
opensim-SC_OLD-2f4f83e3434a8171392519841991005a0a111a11.tar.bz2
opensim-SC_OLD-2f4f83e3434a8171392519841991005a0a111a11.tar.xz
Make remoting errors because of missing adjacent regions a little more user and console friendly
Diffstat
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs56
1 files changed, 36 insertions, 20 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index fe46632..3708fff 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -381,6 +381,7 @@ namespace OpenSim.Region.Communications.OGS1
381 381
382 public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) 382 public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
383 { 383 {
384 RegionInfo regInfo = null;
384 try 385 try
385 { 386 {
386 if (m_localBackend.InformRegionOfChildAgent(regionHandle, agentData)) 387 if (m_localBackend.InformRegionOfChildAgent(regionHandle, agentData))
@@ -388,7 +389,7 @@ namespace OpenSim.Region.Communications.OGS1
388 return true; 389 return true;
389 } 390 }
390 391
391 RegionInfo regInfo = RequestNeighbourInfo(regionHandle); 392 regInfo = RequestNeighbourInfo(regionHandle);
392 if (regInfo != null) 393 if (regInfo != null)
393 { 394 {
394 //don't want to be creating a new link to the remote instance every time like we are here 395 //don't want to be creating a new link to the remote instance every time like we are here
@@ -419,27 +420,32 @@ namespace OpenSim.Region.Communications.OGS1
419 } 420 }
420 catch (RemotingException e) 421 catch (RemotingException e)
421 { 422 {
422 MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString()); 423 MainLog.Instance.Warn("Remoting Error: Unable to connect to adjacent region: " + regInfo.RegionName + " " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
424 MainLog.Instance.Debug(e.ToString());
423 return false; 425 return false;
424 } 426 }
425 catch (SocketException e) 427 catch (SocketException e)
426 { 428 {
427 MainLog.Instance.Error("Socket Error: Unable to connect to remote region.\n" + e.ToString()); 429 MainLog.Instance.Warn("Socket Error: Unable to connect to adjacent region: " + regInfo.RegionName + " " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
430 MainLog.Instance.Debug(e.ToString());
428 return false; 431 return false;
429 } 432 }
430 catch (InvalidCredentialException e) 433 catch (InvalidCredentialException e)
431 { 434 {
432 MainLog.Instance.Error("Invalid Credentials: Unable to connect to remote region.\n" + e.ToString()); 435 MainLog.Instance.Warn("Invalid Credentials: Unable to connect to adjacent region: " + regInfo.RegionName + " " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
436 MainLog.Instance.Debug(e.ToString());
433 return false; 437 return false;
434 } 438 }
435 catch (AuthenticationException e) 439 catch (AuthenticationException e)
436 { 440 {
437 MainLog.Instance.Error("Authentication exception: Unable to connect to remote region.\n" + e.ToString()); 441 MainLog.Instance.Warn("Authentication exception: Unable to connect to adjacent region: " + regInfo.RegionName + " " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
442 MainLog.Instance.Debug(e.ToString());
438 return false; 443 return false;
439 } 444 }
440 catch (Exception e) 445 catch (Exception e)
441 { 446 {
442 MainLog.Instance.Error("Unknown exception: Unable to connect to remote region.\n" + e.ToString()); 447 MainLog.Instance.Warn("Unknown exception: Unable to connect to adjacent region: " + regInfo.RegionName + " " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
448 MainLog.Instance.Debug(e.ToString());
443 return false; 449 return false;
444 } 450 }
445 return true; 451 return true;
@@ -453,6 +459,7 @@ namespace OpenSim.Region.Communications.OGS1
453 459
454 public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData) 460 public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData)
455 { 461 {
462 RegionInfo regInfo = null;
456 try 463 try
457 { 464 {
458 if (m_localBackend.InformRegionOfPrimCrossing(regionHandle,primID, objData)) 465 if (m_localBackend.InformRegionOfPrimCrossing(regionHandle,primID, objData))
@@ -460,7 +467,7 @@ namespace OpenSim.Region.Communications.OGS1
460 return true; 467 return true;
461 } 468 }
462 469
463 RegionInfo regInfo = RequestNeighbourInfo(regionHandle); 470 regInfo = RequestNeighbourInfo(regionHandle);
464 if (regInfo != null) 471 if (regInfo != null)
465 { 472 {
466 //don't want to be creating a new link to the remote instance every time like we are here 473 //don't want to be creating a new link to the remote instance every time like we are here
@@ -491,27 +498,32 @@ namespace OpenSim.Region.Communications.OGS1
491 } 498 }
492 catch (RemotingException e) 499 catch (RemotingException e)
493 { 500 {
494 MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString()); 501 MainLog.Instance.Warn("Remoting Error: Unable to connect to adjacent region: " + regInfo.RegionName + " " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
502 MainLog.Instance.Debug(e.ToString());
495 return false; 503 return false;
496 } 504 }
497 catch (SocketException e) 505 catch (SocketException e)
498 { 506 {
499 MainLog.Instance.Error("Socket Error: Unable to connect to remote region.\n" + e.ToString()); 507 MainLog.Instance.Warn("Socket Error: Unable to connect to adjacent region: " + regInfo.RegionName + " " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
508 MainLog.Instance.Debug(e.ToString());
500 return false; 509 return false;
501 } 510 }
502 catch (InvalidCredentialException e) 511 catch (InvalidCredentialException e)
503 { 512 {
504 MainLog.Instance.Error("Invalid Credentials: Unable to connect to remote region.\n" + e.ToString()); 513 MainLog.Instance.Warn("Invalid Credentials: Unable to connect to adjacent region: " + regInfo.RegionName + " " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
514 MainLog.Instance.Debug(e.ToString());
505 return false; 515 return false;
506 } 516 }
507 catch (AuthenticationException e) 517 catch (AuthenticationException e)
508 { 518 {
509 MainLog.Instance.Error("Authentication exception: Unable to connect to remote region.\n" + e.ToString()); 519 MainLog.Instance.Warn("Authentication exception: Unable to connect to adjacent region: " + regInfo.RegionName + " " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
520 MainLog.Instance.Debug(e.ToString());
510 return false; 521 return false;
511 } 522 }
512 catch (Exception e) 523 catch (Exception e)
513 { 524 {
514 MainLog.Instance.Error("Unknown exception: Unable to connect to remote region.\n" + e.ToString()); 525 MainLog.Instance.Warn("Unknown exception: Unable to connect to adjacent region: " + regInfo.RegionName + " " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
526 MainLog.Instance.Debug(e.ToString());
515 return false; 527 return false;
516 } 528 }
517 return true; 529 return true;
@@ -525,6 +537,7 @@ namespace OpenSim.Region.Communications.OGS1
525 /// <returns></returns> 537 /// <returns></returns>
526 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) 538 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying)
527 { 539 {
540 RegionInfo regInfo = null;
528 try 541 try
529 { 542 {
530 if (m_localBackend.TriggerExpectAvatarCrossing(regionHandle, agentID, position, isFlying)) 543 if (m_localBackend.TriggerExpectAvatarCrossing(regionHandle, agentID, position, isFlying))
@@ -532,7 +545,7 @@ namespace OpenSim.Region.Communications.OGS1
532 return true; 545 return true;
533 } 546 }
534 547
535 RegionInfo regInfo = RequestNeighbourInfo(regionHandle); 548 regInfo = RequestNeighbourInfo(regionHandle);
536 if (regInfo != null) 549 if (regInfo != null)
537 { 550 {
538 bool retValue = false; 551 bool retValue = false;
@@ -559,7 +572,8 @@ namespace OpenSim.Region.Communications.OGS1
559 } 572 }
560 catch (RemotingException e) 573 catch (RemotingException e)
561 { 574 {
562 MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString()); 575 MainLog.Instance.Warn("Remoting Error: Unable to connect to adjacent region: " + regInfo.RegionName + " " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
576 MainLog.Instance.Debug(e.ToString());
563 return false; 577 return false;
564 } 578 }
565 catch 579 catch
@@ -569,6 +583,7 @@ namespace OpenSim.Region.Communications.OGS1
569 } 583 }
570 public bool ExpectPrimCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isPhysical) 584 public bool ExpectPrimCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isPhysical)
571 { 585 {
586 RegionInfo regInfo = null;
572 try 587 try
573 { 588 {
574 if (m_localBackend.TriggerExpectPrimCrossing(regionHandle, agentID, position, isPhysical)) 589 if (m_localBackend.TriggerExpectPrimCrossing(regionHandle, agentID, position, isPhysical))
@@ -576,7 +591,7 @@ namespace OpenSim.Region.Communications.OGS1
576 return true; 591 return true;
577 } 592 }
578 593
579 RegionInfo regInfo = RequestNeighbourInfo(regionHandle); 594 regInfo = RequestNeighbourInfo(regionHandle);
580 if (regInfo != null) 595 if (regInfo != null)
581 { 596 {
582 bool retValue = false; 597 bool retValue = false;
@@ -603,7 +618,8 @@ namespace OpenSim.Region.Communications.OGS1
603 } 618 }
604 catch (RemotingException e) 619 catch (RemotingException e)
605 { 620 {
606 MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString()); 621 MainLog.Instance.Warn("Remoting Error: Unable to connect to adjacent region: " + regInfo.RegionName + " " + regInfo.RegionLocX + "," + regInfo.RegionLocY);
622 MainLog.Instance.Debug(e.ToString());
607 return false; 623 return false;
608 } 624 }
609 catch 625 catch
@@ -644,7 +660,7 @@ namespace OpenSim.Region.Communications.OGS1
644 } 660 }
645 catch (RemotingException e) 661 catch (RemotingException e)
646 { 662 {
647 MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString()); 663 MainLog.Instance.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString());
648 return false; 664 return false;
649 } 665 }
650 } 666 }
@@ -666,7 +682,7 @@ namespace OpenSim.Region.Communications.OGS1
666 } 682 }
667 catch (RemotingException e) 683 catch (RemotingException e)
668 { 684 {
669 MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString()); 685 MainLog.Instance.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString());
670 return false; 686 return false;
671 } 687 }
672 } 688 }
@@ -685,7 +701,7 @@ namespace OpenSim.Region.Communications.OGS1
685 } 701 }
686 catch (RemotingException e) 702 catch (RemotingException e)
687 { 703 {
688 MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString()); 704 MainLog.Instance.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString());
689 return false; 705 return false;
690 } 706 }
691 } 707 }
@@ -697,7 +713,7 @@ namespace OpenSim.Region.Communications.OGS1
697 } 713 }
698 catch (RemotingException e) 714 catch (RemotingException e)
699 { 715 {
700 MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString()); 716 MainLog.Instance.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString());
701 return false; 717 return false;
702 } 718 }
703 } 719 }
generated by cgit v1.1 at 2024-11-06 08:09:29 +0000