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

distinguish between FriendsSimConnector and FriendsServiceConnector in log

0.7.2-post-fixes
Justin Clark-Casey (justincc) 2011-11-15 21:51:45 +00:00
parent 66863fdd34
commit 85170f5d5d
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
View File

@ -67,7 +67,7 @@ namespace OpenSim.Services.Connectors.Friends
IConfig gridConfig = source.Configs["FriendsService"]; IConfig gridConfig = source.Configs["FriendsService"];
if (gridConfig == null) if (gridConfig == null)
{ {
m_log.Error("[FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini"); m_log.Error("[FRIENDS SERVICE CONNECTOR]: FriendsService missing from OpenSim.ini");
throw new Exception("Friends connector init error"); throw new Exception("Friends connector init error");
} }
@ -76,7 +76,7 @@ namespace OpenSim.Services.Connectors.Friends
if (serviceURI == String.Empty) if (serviceURI == String.Empty)
{ {
m_log.Error("[FRIENDS CONNECTOR]: No Server URI named in section FriendsService"); m_log.Error("[FRIENDS SERVICE CONNECTOR]: No Server URI named in section FriendsService");
throw new Exception("Friends connector init error"); throw new Exception("Friends connector init error");
} }
m_ServerURI = serviceURI; m_ServerURI = serviceURI;
@ -127,7 +127,7 @@ namespace OpenSim.Services.Connectors.Friends
List<FriendInfo> finfos = new List<FriendInfo>(); List<FriendInfo> finfos = new List<FriendInfo>();
Dictionary<string, object>.ValueCollection finfosList = replyData.Values; Dictionary<string, object>.ValueCollection finfosList = replyData.Values;
//m_log.DebugFormat("[FRIENDS CONNECTOR]: get neighbours returned {0} elements", rinfosList.Count); //m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: get neighbours returned {0} elements", rinfosList.Count);
foreach (object f in finfosList) foreach (object f in finfosList)
{ {
if (f is Dictionary<string, object>) if (f is Dictionary<string, object>)
@ -136,7 +136,7 @@ namespace OpenSim.Services.Connectors.Friends
finfos.Add(finfo); finfos.Add(finfo);
} }
else else
m_log.DebugFormat("[FRIENDS CONNECTOR]: GetFriends {0} received invalid response type {1}", m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: GetFriends {0} received invalid response type {1}",
PrincipalID, f.GetType()); PrincipalID, f.GetType());
} }
@ -145,14 +145,14 @@ namespace OpenSim.Services.Connectors.Friends
} }
else else
m_log.DebugFormat("[FRIENDS CONNECTOR]: GetFriends {0} received null response", m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: GetFriends {0} received null response",
PrincipalID); PrincipalID);
} }
} }
catch (Exception e) catch (Exception e)
{ {
m_log.DebugFormat("[FRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message); m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: Exception when contacting friends server: {0}", e.Message);
} }
return new FriendInfo[0]; return new FriendInfo[0];
@ -175,7 +175,7 @@ namespace OpenSim.Services.Connectors.Friends
} }
catch (Exception e) catch (Exception e)
{ {
m_log.DebugFormat("[FRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message); m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: Exception when contacting friends server: {0}", e.Message);
return false; return false;
} }
@ -190,11 +190,11 @@ namespace OpenSim.Services.Connectors.Friends
return success; return success;
} }
else else
m_log.DebugFormat("[FRIENDS CONNECTOR]: StoreFriend {0} {1} received null response", m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: StoreFriend {0} {1} received null response",
PrincipalID, Friend); PrincipalID, Friend);
} }
else else
m_log.DebugFormat("[FRIENDS CONNECTOR]: StoreFriend received null reply"); m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: StoreFriend received null reply");
return false; return false;
@ -231,7 +231,7 @@ namespace OpenSim.Services.Connectors.Friends
} }
catch (Exception e) catch (Exception e)
{ {
m_log.DebugFormat("[FRIENDS CONNECTOR]: Exception when contacting friends server: {0}", e.Message); m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: Exception when contacting friends server: {0}", e.Message);
return false; return false;
} }
@ -246,11 +246,11 @@ namespace OpenSim.Services.Connectors.Friends
return success; return success;
} }
else else
m_log.DebugFormat("[FRIENDS CONNECTOR]: DeleteFriend {0} {1} received null response", m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: DeleteFriend {0} {1} received null response",
PrincipalID, Friend); PrincipalID, Friend);
} }
else else
m_log.DebugFormat("[FRIENDS CONNECTOR]: DeleteFriend received null reply"); m_log.DebugFormat("[FRIENDS SERVICE CONNECTOR]: DeleteFriend received null reply");
return false; return false;
} }

10
OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
View File

@ -134,11 +134,11 @@ namespace OpenSim.Services.Connectors.Friends
private bool Call(GridRegion region, Dictionary<string, object> sendData) private bool Call(GridRegion region, Dictionary<string, object> sendData)
{ {
string reqString = ServerUtils.BuildQueryString(sendData); string reqString = ServerUtils.BuildQueryString(sendData);
//m_log.DebugFormat("[FRIENDS CONNECTOR]: queryString = {0}", reqString); //m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: queryString = {0}", reqString);
if (region == null) if (region == null)
return false; return false;
m_log.DebugFormat("[FRIENDS CONNECTOR]: region: {0}", region.ExternalHostName + ":" + region.HttpPort); m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: region: {0}", region.ExternalHostName + ":" + region.HttpPort);
try try
{ {
string url = "http://" + region.ExternalHostName + ":" + region.HttpPort; string url = "http://" + region.ExternalHostName + ":" + region.HttpPort;
@ -157,15 +157,15 @@ namespace OpenSim.Services.Connectors.Friends
return false; return false;
} }
else else
m_log.DebugFormat("[FRIENDS CONNECTOR]: reply data does not contain result field"); m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: reply data does not contain result field");
} }
else else
m_log.DebugFormat("[FRIENDS CONNECTOR]: received empty reply"); m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: received empty reply");
} }
catch (Exception e) catch (Exception e)
{ {
m_log.DebugFormat("[FRIENDS CONNECTOR]: Exception when contacting remote sim: {0}", e.ToString()); m_log.DebugFormat("[FRIENDS SIM CONNECTOR]: Exception when contacting remote sim: {0}", e.ToString());
} }
return false; return false;