diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 156 |
1 files changed, 77 insertions, 79 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index b9b35c0..f602e374 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -328,7 +328,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
328 | 328 | ||
329 | if (responseData.ContainsKey("error")) | 329 | if (responseData.ContainsKey("error")) |
330 | { | 330 | { |
331 | Console.WriteLine("error received from grid server" + responseData["error"]); | 331 | Console.WriteLine("[OGS1 GRID SERVICES]: Error received from grid server" + responseData["error"]); |
332 | return null; | 332 | return null; |
333 | } | 333 | } |
334 | 334 | ||
@@ -352,7 +352,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
352 | } | 352 | } |
353 | catch (WebException) | 353 | catch (WebException) |
354 | { | 354 | { |
355 | m_log.Error("[GRID]: " + | 355 | m_log.Error("[OGS1 GRID SERVICES]: " + |
356 | "Region lookup failed for: " + regionHandle.ToString() + | 356 | "Region lookup failed for: " + regionHandle.ToString() + |
357 | " - Is the GridServer down?"); | 357 | " - Is the GridServer down?"); |
358 | return null; | 358 | return null; |
@@ -509,7 +509,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
509 | m_log.Debug("[CONNECTION DEBUGGING]: Triggering welcome for " + agentData.AgentID.ToString() + " into " + regionHandle.ToString()); | 509 | m_log.Debug("[CONNECTION DEBUGGING]: Triggering welcome for " + agentData.AgentID.ToString() + " into " + regionHandle.ToString()); |
510 | m_localBackend.TriggerExpectUser(regionHandle, agentData); | 510 | m_localBackend.TriggerExpectUser(regionHandle, agentData); |
511 | 511 | ||
512 | m_log.Info("[GRID]: Welcoming new user..."); | 512 | m_log.Info("[OGS1 GRID SERVICES]: Welcoming new user..."); |
513 | 513 | ||
514 | return new XmlRpcResponse(); | 514 | return new XmlRpcResponse(); |
515 | } | 515 | } |
@@ -529,7 +529,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
529 | } | 529 | } |
530 | catch (Exception ex) | 530 | catch (Exception ex) |
531 | { | 531 | { |
532 | m_log.Error("Exception while attempting to listen on TCP port " + (int)NetworkServersInfo.RemotingListenerPort + "."); | 532 | m_log.Error("[OGS1 GRID SERVICES]: Exception while attempting to listen on TCP port " + (int)NetworkServersInfo.RemotingListenerPort + "."); |
533 | throw (ex); | 533 | throw (ex); |
534 | } | 534 | } |
535 | 535 | ||
@@ -607,9 +607,9 @@ namespace OpenSim.Region.Communications.OGS1 | |||
607 | NoteDeadRegion(regionHandle); | 607 | NoteDeadRegion(regionHandle); |
608 | 608 | ||
609 | m_log.WarnFormat( | 609 | m_log.WarnFormat( |
610 | "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", | 610 | "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", |
611 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); | 611 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); |
612 | m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message); | 612 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
613 | 613 | ||
614 | return false; | 614 | return false; |
615 | } | 615 | } |
@@ -618,9 +618,9 @@ namespace OpenSim.Region.Communications.OGS1 | |||
618 | NoteDeadRegion(regionHandle); | 618 | NoteDeadRegion(regionHandle); |
619 | 619 | ||
620 | m_log.WarnFormat( | 620 | m_log.WarnFormat( |
621 | "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", | 621 | "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", |
622 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); | 622 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); |
623 | m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message); | 623 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
624 | 624 | ||
625 | return false; | 625 | return false; |
626 | } | 626 | } |
@@ -629,9 +629,9 @@ namespace OpenSim.Region.Communications.OGS1 | |||
629 | NoteDeadRegion(regionHandle); | 629 | NoteDeadRegion(regionHandle); |
630 | 630 | ||
631 | m_log.WarnFormat( | 631 | m_log.WarnFormat( |
632 | "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", | 632 | "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", |
633 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); | 633 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); |
634 | m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message); | 634 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
635 | 635 | ||
636 | return false; | 636 | return false; |
637 | } | 637 | } |
@@ -640,9 +640,9 @@ namespace OpenSim.Region.Communications.OGS1 | |||
640 | NoteDeadRegion(regionHandle); | 640 | NoteDeadRegion(regionHandle); |
641 | 641 | ||
642 | m_log.WarnFormat( | 642 | m_log.WarnFormat( |
643 | "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", | 643 | "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", |
644 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); | 644 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); |
645 | m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message); | 645 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
646 | 646 | ||
647 | return false; | 647 | return false; |
648 | } | 648 | } |
@@ -650,9 +650,9 @@ namespace OpenSim.Region.Communications.OGS1 | |||
650 | { | 650 | { |
651 | NoteDeadRegion(regionHandle); | 651 | NoteDeadRegion(regionHandle); |
652 | 652 | ||
653 | m_log.WarnFormat("Unable to connect to adjacent region: {0} {1},{2}", | 653 | m_log.WarnFormat("[OGS1 GRID SERVICES]: Unable to connect to adjacent region: {0} {1},{2}", |
654 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); | 654 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); |
655 | m_log.DebugFormat("{0} {1}", e.Source, e.Message); | 655 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
656 | 656 | ||
657 | return false; | 657 | return false; |
658 | } | 658 | } |
@@ -699,10 +699,10 @@ namespace OpenSim.Region.Communications.OGS1 | |||
699 | } | 699 | } |
700 | else | 700 | else |
701 | { | 701 | { |
702 | Console.WriteLine("remoting object not found"); | 702 | Console.WriteLine("[OGS1 GRID SERVICES]: remoting object not found"); |
703 | } | 703 | } |
704 | remObject = null; | 704 | remObject = null; |
705 | m_log.Info("[INTER]: " + | 705 | m_log.Info("[OGS1 GRID SERVICES]: " + |
706 | gdebugRegionName + ": OGS1 tried to InformRegionOfChildAgent for " + | 706 | gdebugRegionName + ": OGS1 tried to InformRegionOfChildAgent for " + |
707 | agentData.firstname + " " + agentData.lastname + " and got " + | 707 | agentData.firstname + " " + agentData.lastname + " and got " + |
708 | retValue.ToString()); | 708 | retValue.ToString()); |
@@ -718,9 +718,9 @@ namespace OpenSim.Region.Communications.OGS1 | |||
718 | NoteDeadRegion(regionHandle); | 718 | NoteDeadRegion(regionHandle); |
719 | 719 | ||
720 | m_log.WarnFormat( | 720 | m_log.WarnFormat( |
721 | "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", | 721 | "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", |
722 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); | 722 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); |
723 | m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message); | 723 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
724 | 724 | ||
725 | return false; | 725 | return false; |
726 | } | 726 | } |
@@ -729,9 +729,9 @@ namespace OpenSim.Region.Communications.OGS1 | |||
729 | NoteDeadRegion(regionHandle); | 729 | NoteDeadRegion(regionHandle); |
730 | 730 | ||
731 | m_log.WarnFormat( | 731 | m_log.WarnFormat( |
732 | "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", | 732 | "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", |
733 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); | 733 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); |
734 | m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message); | 734 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
735 | 735 | ||
736 | return false; | 736 | return false; |
737 | } | 737 | } |
@@ -740,9 +740,9 @@ namespace OpenSim.Region.Communications.OGS1 | |||
740 | NoteDeadRegion(regionHandle); | 740 | NoteDeadRegion(regionHandle); |
741 | 741 | ||
742 | m_log.WarnFormat( | 742 | m_log.WarnFormat( |
743 | "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", | 743 | "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", |
744 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); | 744 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); |
745 | m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message); | 745 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
746 | 746 | ||
747 | return false; | 747 | return false; |
748 | } | 748 | } |
@@ -751,9 +751,9 @@ namespace OpenSim.Region.Communications.OGS1 | |||
751 | NoteDeadRegion(regionHandle); | 751 | NoteDeadRegion(regionHandle); |
752 | 752 | ||
753 | m_log.WarnFormat( | 753 | m_log.WarnFormat( |
754 | "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", | 754 | "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", |
755 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); | 755 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); |
756 | m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message); | 756 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
757 | 757 | ||
758 | return false; | 758 | return false; |
759 | } | 759 | } |
@@ -762,9 +762,9 @@ namespace OpenSim.Region.Communications.OGS1 | |||
762 | NoteDeadRegion(regionHandle); | 762 | NoteDeadRegion(regionHandle); |
763 | 763 | ||
764 | m_log.WarnFormat( | 764 | m_log.WarnFormat( |
765 | "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", | 765 | "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", |
766 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); | 766 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); |
767 | m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message); | 767 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
768 | 768 | ||
769 | return false; | 769 | return false; |
770 | } | 770 | } |
@@ -832,40 +832,40 @@ namespace OpenSim.Region.Communications.OGS1 | |||
832 | } | 832 | } |
833 | catch (RemotingException e) | 833 | catch (RemotingException e) |
834 | { | 834 | { |
835 | m_log.Warn("Remoting Error: Unable to connect to adjacent region using tcp://" + | 835 | m_log.Warn("[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region using tcp://" + |
836 | regInfo.RemotingAddress + | 836 | regInfo.RemotingAddress + |
837 | ":" + regInfo.RemotingPort + | 837 | ":" + regInfo.RemotingPort + |
838 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + | 838 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + |
839 | " - Is this neighbor up?"); | 839 | " - Is this neighbor up?"); |
840 | m_log.Debug(e.ToString()); | 840 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
841 | return false; | 841 | return false; |
842 | } | 842 | } |
843 | catch (SocketException e) | 843 | catch (SocketException e) |
844 | { | 844 | { |
845 | m_log.Warn("Socket Error: Unable to connect to adjacent region using tcp://" + | 845 | m_log.Warn("[OGS1 GRID SERVICES]: Socket Error: Unable to connect to adjacent region using tcp://" + |
846 | regInfo.RemotingAddress + | 846 | regInfo.RemotingAddress + |
847 | ":" + regInfo.RemotingPort + | 847 | ":" + regInfo.RemotingPort + |
848 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + | 848 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + |
849 | " - Is this neighbor up?"); | 849 | " - Is this neighbor up?"); |
850 | m_log.Debug(e.ToString()); | 850 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
851 | return false; | 851 | return false; |
852 | } | 852 | } |
853 | catch (InvalidCredentialException e) | 853 | catch (InvalidCredentialException e) |
854 | { | 854 | { |
855 | m_log.Warn("Invalid Credentials: Unable to connect to adjacent region using tcp://" + | 855 | m_log.Warn("[OGS1 GRID SERVICES]: Invalid Credentials: Unable to connect to adjacent region using tcp://" + |
856 | regInfo.RemotingAddress + | 856 | regInfo.RemotingAddress + |
857 | ":" + regInfo.RemotingPort + | 857 | ":" + regInfo.RemotingPort + |
858 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 858 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
859 | m_log.Debug(e.ToString()); | 859 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
860 | return false; | 860 | return false; |
861 | } | 861 | } |
862 | catch (AuthenticationException e) | 862 | catch (AuthenticationException e) |
863 | { | 863 | { |
864 | m_log.Warn("Authentication exception: Unable to connect to adjacent region using tcp://" + | 864 | m_log.Warn("[OGS1 GRID SERVICES]: Authentication exception: Unable to connect to adjacent region using tcp://" + |
865 | regInfo.RemotingAddress + | 865 | regInfo.RemotingAddress + |
866 | ":" + regInfo.RemotingPort + | 866 | ":" + regInfo.RemotingPort + |
867 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 867 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
868 | m_log.Debug(e.ToString()); | 868 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
869 | return false; | 869 | return false; |
870 | } | 870 | } |
871 | catch (Exception e) | 871 | catch (Exception e) |
@@ -924,7 +924,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
924 | } | 924 | } |
925 | else | 925 | else |
926 | { | 926 | { |
927 | Console.WriteLine("remoting object not found"); | 927 | Console.WriteLine("[OGS1 GRID SERVICES]: Remoting object not found"); |
928 | } | 928 | } |
929 | remObject = null; | 929 | remObject = null; |
930 | 930 | ||
@@ -937,37 +937,36 @@ namespace OpenSim.Region.Communications.OGS1 | |||
937 | catch (RemotingException e) | 937 | catch (RemotingException e) |
938 | { | 938 | { |
939 | NoteDeadRegion(regionHandle); | 939 | NoteDeadRegion(regionHandle); |
940 | m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + regionHandle); | 940 | m_log.Warn("[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: " + regionHandle); |
941 | m_log.Debug(e.ToString()); | 941 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
942 | return false; | 942 | return false; |
943 | } | 943 | } |
944 | catch (SocketException e) | 944 | catch (SocketException e) |
945 | { | 945 | { |
946 | NoteDeadRegion(regionHandle); | 946 | NoteDeadRegion(regionHandle); |
947 | m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + regionHandle); | 947 | m_log.Warn("[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: " + regionHandle); |
948 | m_log.Debug(e.ToString()); | 948 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
949 | return false; | 949 | return false; |
950 | } | 950 | } |
951 | catch (InvalidCredentialException e) | 951 | catch (InvalidCredentialException e) |
952 | { | 952 | { |
953 | NoteDeadRegion(regionHandle); | 953 | NoteDeadRegion(regionHandle); |
954 | m_log.Warn("Invalid Credential Exception: Invalid Credentials : " + regionHandle); | 954 | m_log.Warn("[OGS1 GRID SERVICES]: Invalid Credential Exception: Invalid Credentials : " + regionHandle); |
955 | m_log.Debug(e.ToString()); | 955 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
956 | return false; | 956 | return false; |
957 | } | 957 | } |
958 | catch (AuthenticationException e) | 958 | catch (AuthenticationException e) |
959 | { | 959 | { |
960 | NoteDeadRegion(regionHandle); | 960 | NoteDeadRegion(regionHandle); |
961 | m_log.Warn("Authentication exception: Unable to connect to adjacent region: " + regionHandle); | 961 | m_log.Warn("[OGS1 GRID SERVICES]: Authentication exception: Unable to connect to adjacent region: " + regionHandle); |
962 | 962 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); | |
963 | m_log.Debug(e.ToString()); | ||
964 | return false; | 963 | return false; |
965 | } | 964 | } |
966 | catch (Exception e) | 965 | catch (Exception e) |
967 | { | 966 | { |
968 | NoteDeadRegion(regionHandle); | 967 | NoteDeadRegion(regionHandle); |
969 | m_log.Warn("Unknown exception: Unable to connect to adjacent region: " + regionHandle); | 968 | m_log.Warn("[OGS1 GRID SERVICES]: Unknown exception: Unable to connect to adjacent region: " + regionHandle); |
970 | m_log.Debug(e.ToString()); | 969 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0}", e); |
971 | return false; | 970 | return false; |
972 | } | 971 | } |
973 | } | 972 | } |
@@ -1011,7 +1010,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1011 | } | 1010 | } |
1012 | else | 1011 | else |
1013 | { | 1012 | { |
1014 | Console.WriteLine("remoting object not found"); | 1013 | Console.WriteLine("[OGS1 GRID SERVICES]: Remoting object not found"); |
1015 | } | 1014 | } |
1016 | remObject = null; | 1015 | remObject = null; |
1017 | 1016 | ||
@@ -1027,9 +1026,9 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1027 | NoteDeadRegion(regionHandle); | 1026 | NoteDeadRegion(regionHandle); |
1028 | 1027 | ||
1029 | m_log.WarnFormat( | 1028 | m_log.WarnFormat( |
1030 | "Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", | 1029 | "[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: {0} {1},{2}", |
1031 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); | 1030 | regInfo.RegionName, regInfo.RegionLocX, regInfo.RegionLocY); |
1032 | m_log.DebugFormat("Remoting Error: {0} {1}", e.Source, e.Message); | 1031 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
1033 | 1032 | ||
1034 | return false; | 1033 | return false; |
1035 | } | 1034 | } |
@@ -1067,7 +1066,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1067 | } | 1066 | } |
1068 | else | 1067 | else |
1069 | { | 1068 | { |
1070 | Console.WriteLine("remoting object not found"); | 1069 | Console.WriteLine("[OGS1 GRID SERVICES]: Remoting object not found"); |
1071 | } | 1070 | } |
1072 | remObject = null; | 1071 | remObject = null; |
1073 | 1072 | ||
@@ -1081,37 +1080,36 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1081 | catch (RemotingException e) | 1080 | catch (RemotingException e) |
1082 | { | 1081 | { |
1083 | NoteDeadRegion(regionHandle); | 1082 | NoteDeadRegion(regionHandle); |
1084 | m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + regionHandle); | 1083 | m_log.Warn("[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: " + regionHandle); |
1085 | m_log.Debug(e.ToString()); | 1084 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
1086 | return false; | 1085 | return false; |
1087 | } | 1086 | } |
1088 | catch (SocketException e) | 1087 | catch (SocketException e) |
1089 | { | 1088 | { |
1090 | NoteDeadRegion(regionHandle); | 1089 | NoteDeadRegion(regionHandle); |
1091 | m_log.Warn("Remoting Error: Unable to connect to adjacent region: " + regionHandle); | 1090 | m_log.Warn("[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region: " + regionHandle); |
1092 | m_log.Debug(e.ToString()); | 1091 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
1093 | return false; | 1092 | return false; |
1094 | } | 1093 | } |
1095 | catch (InvalidCredentialException e) | 1094 | catch (InvalidCredentialException e) |
1096 | { | 1095 | { |
1097 | NoteDeadRegion(regionHandle); | 1096 | NoteDeadRegion(regionHandle); |
1098 | m_log.Warn("Invalid Credential Exception: Invalid Credentials : " + regionHandle); | 1097 | m_log.Warn("[OGS1 GRID SERVICES]: Invalid Credential Exception: Invalid Credentials : " + regionHandle); |
1099 | m_log.Debug(e.ToString()); | 1098 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
1100 | return false; | 1099 | return false; |
1101 | } | 1100 | } |
1102 | catch (AuthenticationException e) | 1101 | catch (AuthenticationException e) |
1103 | { | 1102 | { |
1104 | NoteDeadRegion(regionHandle); | 1103 | NoteDeadRegion(regionHandle); |
1105 | m_log.Warn("Authentication exception: Unable to connect to adjacent region: " + regionHandle); | 1104 | m_log.Warn("[OGS1 GRID SERVICES]: Authentication exception: Unable to connect to adjacent region: " + regionHandle); |
1106 | 1105 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); | |
1107 | m_log.Debug(e.ToString()); | ||
1108 | return false; | 1106 | return false; |
1109 | } | 1107 | } |
1110 | catch (Exception e) | 1108 | catch (Exception e) |
1111 | { | 1109 | { |
1112 | NoteDeadRegion(regionHandle); | 1110 | NoteDeadRegion(regionHandle); |
1113 | m_log.Warn("Unknown exception: Unable to connect to adjacent region: " + regionHandle); | 1111 | m_log.Warn("[OGS1 GRID SERVICES]: Unknown exception: Unable to connect to adjacent region: " + regionHandle); |
1114 | m_log.Debug(e.ToString()); | 1112 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0}", e); |
1115 | return false; | 1113 | return false; |
1116 | } | 1114 | } |
1117 | } | 1115 | } |
@@ -1142,7 +1140,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1142 | } | 1140 | } |
1143 | else | 1141 | else |
1144 | { | 1142 | { |
1145 | Console.WriteLine("remoting object not found"); | 1143 | Console.WriteLine("[OGS1 GRID SERVICES]: Remoting object not found"); |
1146 | } | 1144 | } |
1147 | remObject = null; | 1145 | remObject = null; |
1148 | 1146 | ||
@@ -1156,7 +1154,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1156 | catch (RemotingException) | 1154 | catch (RemotingException) |
1157 | { | 1155 | { |
1158 | NoteDeadRegion(regionHandle); | 1156 | NoteDeadRegion(regionHandle); |
1159 | m_log.Warn("Remoting Error: Unable to connect to adjacent region to tell it to close child agents: " + regInfo.RegionName + | 1157 | m_log.Warn("[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region to tell it to close child agents: " + regInfo.RegionName + |
1160 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 1158 | " " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
1161 | //m_log.Debug(e.ToString()); | 1159 | //m_log.Debug(e.ToString()); |
1162 | return false; | 1160 | return false; |
@@ -1165,42 +1163,42 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1165 | catch (SocketException e) | 1163 | catch (SocketException e) |
1166 | { | 1164 | { |
1167 | NoteDeadRegion(regionHandle); | 1165 | NoteDeadRegion(regionHandle); |
1168 | m_log.Warn("Socket Error: Unable to connect to adjacent region using tcp://" + | 1166 | m_log.Warn("[OGS1 GRID SERVICES]: Socket Error: Unable to connect to adjacent region using tcp://" + |
1169 | regInfo.RemotingAddress + | 1167 | regInfo.RemotingAddress + |
1170 | ":" + regInfo.RemotingPort + | 1168 | ":" + regInfo.RemotingPort + |
1171 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + | 1169 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + |
1172 | " - Is this neighbor up?"); | 1170 | " - Is this neighbor up?"); |
1173 | m_log.Debug(e.ToString()); | 1171 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
1174 | return false; | 1172 | return false; |
1175 | } | 1173 | } |
1176 | catch (InvalidCredentialException e) | 1174 | catch (InvalidCredentialException e) |
1177 | { | 1175 | { |
1178 | NoteDeadRegion(regionHandle); | 1176 | NoteDeadRegion(regionHandle); |
1179 | m_log.Warn("Invalid Credentials: Unable to connect to adjacent region using tcp://" + | 1177 | m_log.Warn("[OGS1 GRID SERVICES]: Invalid Credentials: Unable to connect to adjacent region using tcp://" + |
1180 | regInfo.RemotingAddress + | 1178 | regInfo.RemotingAddress + |
1181 | ":" + regInfo.RemotingPort + | 1179 | ":" + regInfo.RemotingPort + |
1182 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 1180 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
1183 | m_log.Debug(e.ToString()); | 1181 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
1184 | return false; | 1182 | return false; |
1185 | } | 1183 | } |
1186 | catch (AuthenticationException e) | 1184 | catch (AuthenticationException e) |
1187 | { | 1185 | { |
1188 | NoteDeadRegion(regionHandle); | 1186 | NoteDeadRegion(regionHandle); |
1189 | m_log.Warn("Authentication exception: Unable to connect to adjacent region using tcp://" + | 1187 | m_log.Warn("[OGS1 GRID SERVICES]: Authentication exception: Unable to connect to adjacent region using tcp://" + |
1190 | regInfo.RemotingAddress + | 1188 | regInfo.RemotingAddress + |
1191 | ":" + regInfo.RemotingPort + | 1189 | ":" + regInfo.RemotingPort + |
1192 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 1190 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
1193 | m_log.Debug(e.ToString()); | 1191 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
1194 | return false; | 1192 | return false; |
1195 | } | 1193 | } |
1196 | catch (WebException e) | 1194 | catch (WebException e) |
1197 | { | 1195 | { |
1198 | NoteDeadRegion(regionHandle); | 1196 | NoteDeadRegion(regionHandle); |
1199 | m_log.Warn("WebException exception: Unable to connect to adjacent region using tcp://" + | 1197 | m_log.Warn("[OGS1 GRID SERVICES]: WebException exception: Unable to connect to adjacent region using tcp://" + |
1200 | regInfo.RemotingAddress + | 1198 | regInfo.RemotingAddress + |
1201 | ":" + regInfo.RemotingPort + | 1199 | ":" + regInfo.RemotingPort + |
1202 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); | 1200 | "/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY); |
1203 | m_log.Debug(e.ToString()); | 1201 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0} {1}", e.Source, e.Message); |
1204 | return false; | 1202 | return false; |
1205 | } | 1203 | } |
1206 | catch (Exception e) | 1204 | catch (Exception e) |
@@ -1210,7 +1208,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1210 | //m_log.Warn("Unknown exception: Unable to connect to adjacent region using tcp://" + regInfo.RemotingAddress + | 1208 | //m_log.Warn("Unknown exception: Unable to connect to adjacent region using tcp://" + regInfo.RemotingAddress + |
1211 | // ":" + regInfo.RemotingPort + | 1209 | // ":" + regInfo.RemotingPort + |
1212 | //"/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + " - This is likely caused by an incompatibility in the protocol between this sim and that one"); | 1210 | //"/InterRegions - @ " + regInfo.RegionLocX + "," + regInfo.RegionLocY + " - This is likely caused by an incompatibility in the protocol between this sim and that one"); |
1213 | m_log.Debug(e.ToString()); | 1211 | m_log.DebugFormat("[OGS1 GRID SERVICES]: {0}", e); |
1214 | return false; | 1212 | return false; |
1215 | } | 1213 | } |
1216 | } | 1214 | } |
@@ -1252,7 +1250,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1252 | 1250 | ||
1253 | public bool TriggerRegionUp(SearializableRegionInfo regionData, ulong regionhandle) | 1251 | public bool TriggerRegionUp(SearializableRegionInfo regionData, ulong regionhandle) |
1254 | { | 1252 | { |
1255 | m_log.Info("[INTER]: " + | 1253 | m_log.Info("[OGS1 GRID SERVICES]: " + |
1256 | gdebugRegionName + "Incoming OGS1 RegionUpReport: " + "(" + regionData.RegionLocX + | 1254 | gdebugRegionName + "Incoming OGS1 RegionUpReport: " + "(" + regionData.RegionLocX + |
1257 | "," + regionData.RegionLocY + "). Giving this region a fresh set of 'dead' tries"); | 1255 | "," + regionData.RegionLocY + "). Giving this region a fresh set of 'dead' tries"); |
1258 | 1256 | ||
@@ -1272,7 +1270,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1272 | 1270 | ||
1273 | catch (RemotingException e) | 1271 | catch (RemotingException e) |
1274 | { | 1272 | { |
1275 | m_log.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); | 1273 | m_log.Error("[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); |
1276 | return false; | 1274 | return false; |
1277 | } | 1275 | } |
1278 | } | 1276 | } |
@@ -1287,7 +1285,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1287 | } | 1285 | } |
1288 | catch (RemotingException e) | 1286 | catch (RemotingException e) |
1289 | { | 1287 | { |
1290 | m_log.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); | 1288 | m_log.Error("[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); |
1291 | return false; | 1289 | return false; |
1292 | } | 1290 | } |
1293 | } | 1291 | } |
@@ -1310,7 +1308,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1310 | } | 1308 | } |
1311 | catch (RemotingException e) | 1309 | catch (RemotingException e) |
1312 | { | 1310 | { |
1313 | m_log.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); | 1311 | m_log.Error("[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); |
1314 | return false; | 1312 | return false; |
1315 | } | 1313 | } |
1316 | } | 1314 | } |
@@ -1330,7 +1328,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1330 | } | 1328 | } |
1331 | catch (RemotingException e) | 1329 | catch (RemotingException e) |
1332 | { | 1330 | { |
1333 | m_log.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); | 1331 | m_log.Error("[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); |
1334 | return false; | 1332 | return false; |
1335 | } | 1333 | } |
1336 | } | 1334 | } |
@@ -1343,7 +1341,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1343 | } | 1341 | } |
1344 | catch (RemotingException e) | 1342 | catch (RemotingException e) |
1345 | { | 1343 | { |
1346 | m_log.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); | 1344 | m_log.Error("[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); |
1347 | return false; | 1345 | return false; |
1348 | } | 1346 | } |
1349 | } | 1347 | } |
@@ -1356,7 +1354,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
1356 | } | 1354 | } |
1357 | catch (RemotingException) | 1355 | catch (RemotingException) |
1358 | { | 1356 | { |
1359 | m_log.Info("[INTERREGION]: Remoting Error: Unable to connect to neighbour to tell it to close a child connection"); | 1357 | m_log.Info("[OGS1 GRID SERVICES]: Remoting Error: Unable to connect to neighbour to tell it to close a child connection"); |
1360 | return false; | 1358 | return false; |
1361 | } | 1359 | } |
1362 | 1360 | ||