aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs96
1 files changed, 65 insertions, 31 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index cdafad3..b9b35c0 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -605,39 +605,55 @@ namespace OpenSim.Region.Communications.OGS1
605 catch (RemotingException e) 605 catch (RemotingException e)
606 { 606 {
607 NoteDeadRegion(regionHandle); 607 NoteDeadRegion(regionHandle);
608 m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + 608
609 " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); 609 m_log.WarnFormat(
610 m_log.Debug(e.ToString()); 610 "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
611 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
612 m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
613
611 return false; 614 return false;
612 } 615 }
613 catch (SocketException e) 616 catch (SocketException e)
614 { 617 {
615 NoteDeadRegion(regionHandle); 618 NoteDeadRegion(regionHandle);
616 m_log.Warn("Socket Error: Unable to connect to adjacent region: " + " " + 619
617 regInfo.RegionLocX + "," + regInfo.RegionLocY); 620 m_log.WarnFormat(
618 m_log.Debug(e.ToString()); 621 "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
622 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
623 m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
624
619 return false; 625 return false;
620 } 626 }
621 catch (InvalidCredentialException e) 627 catch (InvalidCredentialException e)
622 { 628 {
623 NoteDeadRegion(regionHandle); 629 NoteDeadRegion(regionHandle);
624 m_log.Warn("Invalid Credentials: Unable to connect to adjacent region: " + 630
625 " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); 631 m_log.WarnFormat(
626 m_log.Debug(e.ToString()); 632 "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
633 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
634 m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
635
627 return false; 636 return false;
628 } 637 }
629 catch (AuthenticationException e) 638 catch (AuthenticationException e)
630 { 639 {
631 NoteDeadRegion(regionHandle); 640 NoteDeadRegion(regionHandle);
632 m_log.Warn("Authentication exception: Unable to connect to adjacent region: " + 641
633 " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); 642 m_log.WarnFormat(
634 m_log.Debug(e.ToString()); 643 "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
644 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
645 m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
646
635 return false; 647 return false;
636 } 648 }
637 catch (Exception e) 649 catch (Exception e)
638 { 650 {
639 NoteDeadRegion(regionHandle); 651 NoteDeadRegion(regionHandle);
640 m_log.Debug(e.ToString()); 652
653 m_log.WarnFormat("Unable to connect to adjacent region: {0} {1},{2}",
654 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
655 m_log.DebugFormat("{0} {1}", e.Source, e.Message);
656
641 return false; 657 return false;
642 } 658 }
643 } 659 }
@@ -700,41 +716,56 @@ namespace OpenSim.Region.Communications.OGS1
700 catch (RemotingException e) 716 catch (RemotingException e)
701 { 717 {
702 NoteDeadRegion(regionHandle); 718 NoteDeadRegion(regionHandle);
703 m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + regInfo.RegionName + 719
704 " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); 720 m_log.WarnFormat(
705 m_log.Debug(e.ToString()); 721 "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
722 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
723 m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
724
706 return false; 725 return false;
707 } 726 }
708 catch (SocketException e) 727 catch (SocketException e)
709 { 728 {
710 NoteDeadRegion(regionHandle); 729 NoteDeadRegion(regionHandle);
711 m_log.Warn("Socket Error: Unable to connect to adjacent region: " + regInfo.RegionName + " " + 730
712 regInfo.RegionLocX + "," + regInfo.RegionLocY); 731 m_log.WarnFormat(
713 m_log.Debug(e.ToString()); 732 "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
733 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
734 m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
735
714 return false; 736 return false;
715 } 737 }
716 catch (InvalidCredentialException e) 738 catch (InvalidCredentialException e)
717 { 739 {
718 NoteDeadRegion(regionHandle); 740 NoteDeadRegion(regionHandle);
719 m_log.Warn("Invalid Credentials: Unable to connect to adjacent region: " + regInfo.RegionName + 741
720 " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); 742 m_log.WarnFormat(
721 m_log.Debug(e.ToString()); 743 "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
744 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
745 m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
746
722 return false; 747 return false;
723 } 748 }
724 catch (AuthenticationException e) 749 catch (AuthenticationException e)
725 { 750 {
726 NoteDeadRegion(regionHandle); 751 NoteDeadRegion(regionHandle);
727 m_log.Warn("Authentication exception: Unable to connect to adjacent region: " + 752
728 regInfo.RegionName + " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); 753 m_log.WarnFormat(
729 m_log.Debug(e.ToString()); 754 "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
755 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
756 m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
757
730 return false; 758 return false;
731 } 759 }
732 catch (Exception e) 760 catch (Exception e)
733 { 761 {
734 NoteDeadRegion(regionHandle); 762 NoteDeadRegion(regionHandle);
735 m_log.Warn("Unknown exception: Unable to connect to adjacent region: " + regInfo.RegionName + 763
736 " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); 764 m_log.WarnFormat(
737 m_log.Debug(e.ToString()); 765 "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
766 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
767 m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
768
738 return false; 769 return false;
739 } 770 }
740 } 771 }
@@ -994,9 +1025,12 @@ namespace OpenSim.Region.Communications.OGS1
994 catch (RemotingException e) 1025 catch (RemotingException e)
995 { 1026 {
996 NoteDeadRegion(regionHandle); 1027 NoteDeadRegion(regionHandle);
997 m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + regInfo.RegionName + 1028
998 " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); 1029 m_log.WarnFormat(
999 m_log.Debug(e.ToString()); 1030 "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}",
1031 regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY);
1032 m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message);
1033
1000 return false; 1034 return false;
1001 } 1035 }
1002 catch 1036 catch
generated by cgit v1.1 at 2024-12-30 16:43:49 +0000