From 1430441cf32c659502c6ed1bd7fd54e55a107c05 Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Fri, 26 Mar 2010 15:13:55 -0700 Subject: Change the SimianGrid connector log messages to start with "[SIMIAN " to avoid configuration confusion --- .../SimianGrid/SimianAssetServiceConnector.cs | 14 +++---- .../SimianAuthenticationServiceConnector.cs | 16 ++++---- .../SimianGrid/SimianAvatarServiceConnector.cs | 20 ++++----- .../SimianGrid/SimianFriendsServiceConnector.cs | 12 +++--- .../SimianGrid/SimianGridServiceConnector.cs | 18 ++++---- .../SimianGrid/SimianInventoryServiceConnector.cs | 44 ++++++++++---------- .../SimianGrid/SimianPresenceServiceConnector.cs | 48 +++++++++++----------- .../Connectors/SimianGrid/SimianProfiles.cs | 28 ++++++------- .../SimianUserAccountServiceConnector.cs | 24 +++++------ 9 files changed, 112 insertions(+), 112 deletions(-) diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs index c5fbc9e..27434ad 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs @@ -90,14 +90,14 @@ namespace OpenSim.Services.Connectors.SimianGrid IConfig gridConfig = source.Configs["AssetService"]; if (gridConfig == null) { - m_log.Error("[ASSET CONNECTOR]: AssetService missing from OpenSim.ini"); + m_log.Error("[SIMIAN ASSET CONNECTOR]: AssetService missing from OpenSim.ini"); throw new Exception("Asset connector init error"); } string serviceUrl = gridConfig.GetString("AssetServerURI"); if (String.IsNullOrEmpty(serviceUrl)) { - m_log.Error("[ASSET CONNECTOR]: No AssetServerURI in section AssetService"); + m_log.Error("[SIMIAN ASSET CONNECTOR]: No AssetServerURI in section AssetService"); throw new Exception("Asset connector init error"); } @@ -162,7 +162,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } catch (Exception ex) { - m_log.Warn("[ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message); + m_log.Warn("[SIMIAN ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message); return null; } } @@ -220,7 +220,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } catch (Exception ex) { - m_log.Warn("[ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message); + m_log.Warn("[SIMIAN ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message); } return metadata; @@ -356,7 +356,7 @@ namespace OpenSim.Services.Connectors.SimianGrid errorMessage = ex.Message; } - m_log.WarnFormat("[ASSET CONNECTOR]: Failed to store asset \"{0}\" ({1}, {2}): {3}", + m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: Failed to store asset \"{0}\" ({1}, {2}): {3}", asset.Name, asset.ID, asset.Metadata.ContentType, errorMessage); return null; } @@ -374,7 +374,7 @@ namespace OpenSim.Services.Connectors.SimianGrid if (asset == null) { - m_log.Warn("[ASSET CONNECTOR]: Failed to fetch asset " + id + " for updating"); + m_log.Warn("[SIMIAN ASSET CONNECTOR]: Failed to fetch asset " + id + " for updating"); return false; } @@ -400,7 +400,7 @@ namespace OpenSim.Services.Connectors.SimianGrid if (response["Success"].AsBoolean()) return true; else - m_log.Warn("[ASSET CONNECTOR]: Failed to delete asset " + id + " from the asset service"); + m_log.Warn("[SIMIAN ASSET CONNECTOR]: Failed to delete asset " + id + " from the asset service"); return false; } diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs index 031b326..e78429d 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs @@ -78,14 +78,14 @@ namespace OpenSim.Services.Connectors.SimianGrid IConfig assetConfig = source.Configs["AuthenticationService"]; if (assetConfig == null) { - m_log.Error("[AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini"); + m_log.Error("[SIMIAN AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini"); throw new Exception("Authentication connector init error"); } string serviceURI = assetConfig.GetString("AuthenticationServerURI"); if (String.IsNullOrEmpty(serviceURI)) { - m_log.Error("[AUTH CONNECTOR]: No Server URI named in section AuthenticationService"); + m_log.Error("[SIMIAN AUTH CONNECTOR]: No Server URI named in section AuthenticationService"); throw new Exception("Authentication connector init error"); } @@ -120,11 +120,11 @@ namespace OpenSim.Services.Connectors.SimianGrid } } - m_log.Warn("[AUTH CONNECTOR]: Authentication failed for " + principalID); + m_log.Warn("[SIMIAN AUTH CONNECTOR]: Authentication failed for " + principalID); } else { - m_log.Warn("[AUTH CONNECTOR]: Failed to retrieve identities for " + principalID + ": " + + m_log.Warn("[SIMIAN AUTH CONNECTOR]: Failed to retrieve identities for " + principalID + ": " + response["Message"].AsString()); } @@ -146,7 +146,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - m_log.Warn("[AUTH CONNECTOR]: Could not verify session for " + principalID + ": " + + m_log.Warn("[SIMIAN AUTH CONNECTOR]: Could not verify session for " + principalID + ": " + response["Message"].AsString()); } @@ -168,7 +168,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - m_log.Warn("[AUTH CONNECTOR]: Failed to remove session for " + principalID + ": " + + m_log.Warn("[SIMIAN AUTH CONNECTOR]: Failed to remove session for " + principalID + ": " + response["Message"].AsString()); } @@ -206,14 +206,14 @@ namespace OpenSim.Services.Connectors.SimianGrid bool success = response["Success"].AsBoolean(); if (!success) - m_log.WarnFormat("[AUTH CONNECTOR]: Failed to set password for {0} ({1})", identifier, principalID); + m_log.WarnFormat("[SIMIAN AUTH CONNECTOR]: Failed to set password for {0} ({1})", identifier, principalID); return success; } } else { - m_log.Warn("[AUTH CONNECTOR]: Failed to retrieve identities for " + principalID + ": " + + m_log.Warn("[SIMIAN AUTH CONNECTOR]: Failed to retrieve identities for " + principalID + ": " + response["Message"].AsString()); } diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs index 00f9f36..a47f32c 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs @@ -83,14 +83,14 @@ namespace OpenSim.Services.Connectors.SimianGrid IConfig gridConfig = source.Configs["AvatarService"]; if (gridConfig == null) { - m_log.Error("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini"); + m_log.Error("[SIMIAN AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini"); throw new Exception("Avatar connector init error"); } string serviceUrl = gridConfig.GetString("AvatarServerURI"); if (String.IsNullOrEmpty(serviceUrl)) { - m_log.Error("[AVATAR CONNECTOR]: No AvatarServerURI in section AvatarService"); + m_log.Error("[SIMIAN AVATAR CONNECTOR]: No AvatarServerURI in section AvatarService"); throw new Exception("Avatar connector init error"); } @@ -156,14 +156,14 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - m_log.Warn("[AVATAR CONNECTOR]: Failed to get user appearance for " + userID + + m_log.Warn("[SIMIAN AVATAR CONNECTOR]: Failed to get user appearance for " + userID + ", LLAppearance is missing or invalid"); return null; } } else { - m_log.Warn("[AVATAR CONNECTOR]: Failed to get user appearance for " + userID + ": " + + m_log.Warn("[SIMIAN AVATAR CONNECTOR]: Failed to get user appearance for " + userID + ": " + response["Message"].AsString()); } @@ -172,7 +172,7 @@ namespace OpenSim.Services.Connectors.SimianGrid public bool SetAvatar(UUID userID, AvatarData avatar) { - m_log.Debug("[AVATAR CONNECTOR]: SetAvatar called for " + userID); + m_log.Debug("[SIMIAN AVATAR CONNECTOR]: SetAvatar called for " + userID); if (avatar.AvatarType == 1) // LLAvatar { @@ -228,32 +228,32 @@ namespace OpenSim.Services.Connectors.SimianGrid bool success = response["Success"].AsBoolean(); if (!success) - m_log.Warn("[AVATAR CONNECTOR]: Failed saving appearance for " + userID + ": " + response["Message"].AsString()); + m_log.Warn("[SIMIAN AVATAR CONNECTOR]: Failed saving appearance for " + userID + ": " + response["Message"].AsString()); return success; } else { - m_log.Error("[AVATAR CONNECTOR]: Can't save appearance for " + userID + ". Unhandled avatar type " + avatar.AvatarType); + m_log.Error("[SIMIAN AVATAR CONNECTOR]: Can't save appearance for " + userID + ". Unhandled avatar type " + avatar.AvatarType); return false; } } public bool ResetAvatar(UUID userID) { - m_log.Error("[AVATAR CONNECTOR]: ResetAvatar called for " + userID + ", implement this"); + m_log.Error("[SIMIAN AVATAR CONNECTOR]: ResetAvatar called for " + userID + ", implement this"); return false; } public bool SetItems(UUID userID, string[] names, string[] values) { - m_log.Error("[AVATAR CONNECTOR]: SetItems called for " + userID + " with " + names.Length + " names and " + values.Length + " values, implement this"); + m_log.Error("[SIMIAN AVATAR CONNECTOR]: SetItems called for " + userID + " with " + names.Length + " names and " + values.Length + " values, implement this"); return false; } public bool RemoveItems(UUID userID, string[] names) { - m_log.Error("[AVATAR CONNECTOR]: RemoveItems called for " + userID + " with " + names.Length + " names, implement this"); + m_log.Error("[SIMIAN AVATAR CONNECTOR]: RemoveItems called for " + userID + " with " + names.Length + " names, implement this"); return false; } diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs index 89eb72d..89f3594 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs @@ -89,14 +89,14 @@ namespace OpenSim.Services.Connectors.SimianGrid IConfig assetConfig = source.Configs["FriendsService"]; if (assetConfig == null) { - m_log.Error("[FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini"); + m_log.Error("[SIMIAN FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini"); throw new Exception("Friends connector init error"); } string serviceURI = assetConfig.GetString("FriendsServerURI"); if (String.IsNullOrEmpty(serviceURI)) { - m_log.Error("[FRIENDS CONNECTOR]: No Server URI named in section FriendsService"); + m_log.Error("[SIMIAN FRIENDS CONNECTOR]: No Server URI named in section FriendsService"); throw new Exception("Friends connector init error"); } @@ -169,7 +169,7 @@ namespace OpenSim.Services.Connectors.SimianGrid bool success = response["Success"].AsBoolean(); if (!success) - m_log.Error("[FRIENDS CONNECTOR]: Failed to store friend " + friend + " for user " + principalID + ": " + response["Message"].AsString()); + m_log.Error("[SIMIAN FRIENDS CONNECTOR]: Failed to store friend " + friend + " for user " + principalID + ": " + response["Message"].AsString()); return success; } @@ -188,7 +188,7 @@ namespace OpenSim.Services.Connectors.SimianGrid bool success = response["Success"].AsBoolean(); if (!success) - m_log.Error("[FRIENDS CONNECTOR]: Failed to remove friend " + friend + " for user " + principalID + ": " + response["Message"].AsString()); + m_log.Error("[SIMIAN FRIENDS CONNECTOR]: Failed to remove friend " + friend + " for user " + principalID + ": " + response["Message"].AsString()); return success; } @@ -211,7 +211,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - m_log.Warn("[FRIENDS CONNECTOR]: Failed to retrieve friends for user " + ownerID + ": " + response["Message"].AsString()); + m_log.Warn("[SIMIAN FRIENDS CONNECTOR]: Failed to retrieve friends for user " + ownerID + ": " + response["Message"].AsString()); return new OSDArray(0); } } @@ -232,7 +232,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - m_log.Warn("[FRIENDS CONNECTOR]: Failed to retrieve reverse friends for user " + ownerID + ": " + response["Message"].AsString()); + m_log.Warn("[SIMIAN FRIENDS CONNECTOR]: Failed to retrieve reverse friends for user " + ownerID + ": " + response["Message"].AsString()); return new OSDArray(0); } } diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs index 071a481..3a61226 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs @@ -85,14 +85,14 @@ namespace OpenSim.Services.Connectors.SimianGrid IConfig gridConfig = source.Configs["GridService"]; if (gridConfig == null) { - m_log.Error("[GRID CONNECTOR]: GridService missing from OpenSim.ini"); + m_log.Error("[SIMIAN GRID CONNECTOR]: GridService missing from OpenSim.ini"); throw new Exception("Grid connector init error"); } string serviceUrl = gridConfig.GetString("GridServerURI"); if (String.IsNullOrEmpty(serviceUrl)) { - m_log.Error("[GRID CONNECTOR]: No Server URI named in section GridService"); + m_log.Error("[SIMIAN GRID CONNECTOR]: No Server URI named in section GridService"); throw new Exception("Grid connector init error"); } @@ -155,7 +155,7 @@ namespace OpenSim.Services.Connectors.SimianGrid bool success = response["Success"].AsBoolean(); if (!success) - m_log.Warn("[GRID CONNECTOR]: Region deregistration for " + regionID + " failed: " + response["Message"].AsString()); + m_log.Warn("[SIMIAN GRID CONNECTOR]: Region deregistration for " + regionID + " failed: " + response["Message"].AsString()); return success; } @@ -181,7 +181,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } } - m_log.Debug("[GRID CONNECTOR]: Found " + regions.Count + " neighbors for region " + regionID); + m_log.Debug("[SIMIAN GRID CONNECTOR]: Found " + regions.Count + " neighbors for region " + regionID); return regions; } @@ -203,7 +203,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - m_log.Warn("[GRID CONNECTOR]: Grid service did not find a match for region " + regionID); + m_log.Warn("[SIMIAN GRID CONNECTOR]: Grid service did not find a match for region " + regionID); return null; } } @@ -228,7 +228,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - //m_log.InfoFormat("[GRID CONNECTOR]: Grid service did not find a match for region at {0},{1}", + //m_log.InfoFormat("[SIMIAN GRID CONNECTOR]: Grid service did not find a match for region at {0},{1}", // x / Constants.RegionSize, y / Constants.RegionSize); return null; } @@ -238,7 +238,7 @@ namespace OpenSim.Services.Connectors.SimianGrid { List regions = GetRegionsByName(scopeID, regionName, 1); - m_log.Debug("[GRID CONNECTOR]: Got " + regions.Count + " matches for region name " + regionName); + m_log.Debug("[SIMIAN GRID CONNECTOR]: Got " + regions.Count + " matches for region name " + regionName); if (regions.Count > 0) return regions[0]; @@ -349,7 +349,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - m_log.Warn("[GRID CONNECTOR]: Grid service did not find a match for region " + regionID + " during region flags check"); + m_log.Warn("[SIMIAN GRID CONNECTOR]: Grid service did not find a match for region " + regionID + " during region flags check"); return -1; } } @@ -374,7 +374,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - m_log.Warn("[GRID CONNECTOR]: Grid service did not find a match for region at " + position); + m_log.Warn("[SIMIAN GRID CONNECTOR]: Grid service did not find a match for region at " + position); return null; } } diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs index 67f8e80..56e7475 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs @@ -97,14 +97,14 @@ namespace OpenSim.Services.Connectors.SimianGrid IConfig gridConfig = source.Configs["InventoryService"]; if (gridConfig == null) { - m_log.Error("[INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini"); + m_log.Error("[SIMIAN INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini"); throw new Exception("Inventory connector init error"); } string serviceUrl = gridConfig.GetString("InventoryServerURI"); if (String.IsNullOrEmpty(serviceUrl)) { - m_log.Error("[INVENTORY CONNECTOR]: No Server URI named in section InventoryService"); + m_log.Error("[SIMIAN INVENTORY CONNECTOR]: No Server URI named in section InventoryService"); throw new Exception("Inventory connector init error"); } @@ -117,11 +117,11 @@ namespace OpenSim.Services.Connectors.SimianGrid if (!String.IsNullOrEmpty(serviceUrl)) m_userServerUrl = serviceUrl; else - m_log.Info("[INVENTORY CONNECTOR]: No Server URI named in section UserAccountService"); + m_log.Info("[SIMIAN INVENTORY CONNECTOR]: No Server URI named in section UserAccountService"); } else { - m_log.Warn("[INVENTORY CONNECTOR]: UserAccountService missing from OpenSim.ini"); + m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: UserAccountService missing from OpenSim.ini"); } } } @@ -143,7 +143,7 @@ namespace OpenSim.Services.Connectors.SimianGrid bool success = response["Success"].AsBoolean(); if (!success) - m_log.Warn("[INVENTORY CONNECTOR]: Inventory creation for " + userID + " failed: " + response["Message"].AsString()); + m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Inventory creation for " + userID + " failed: " + response["Message"].AsString()); return success; } @@ -173,7 +173,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - m_log.Warn("[INVENTORY CONNECTOR]: Failed to retrieve inventory skeleton for " + userID + ": " + + m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Failed to retrieve inventory skeleton for " + userID + ": " + response["Message"].AsString()); return new List(0); } @@ -187,7 +187,7 @@ namespace OpenSim.Services.Connectors.SimianGrid [Obsolete] public InventoryCollection GetUserInventory(UUID userID) { - m_log.Error("[INVENTORY CONNECTOR]: Obsolete GetUserInventory called for " + userID); + m_log.Error("[SIMIAN INVENTORY CONNECTOR]: Obsolete GetUserInventory called for " + userID); InventoryCollection inventory = new InventoryCollection(); inventory.UserID = userID; @@ -206,7 +206,7 @@ namespace OpenSim.Services.Connectors.SimianGrid [Obsolete] public void GetUserInventory(UUID userID, InventoryReceiptCallback callback) { - m_log.Error("[INVENTORY CONNECTOR]: Obsolete GetUserInventory called for " + userID); + m_log.Error("[SIMIAN INVENTORY CONNECTOR]: Obsolete GetUserInventory called for " + userID); callback(new List(0), new List(0)); } @@ -273,7 +273,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - m_log.Warn("[INVENTORY CONNECTOR]: Default folder not found for content type " + contentType); + m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Default folder not found for content type " + contentType + ": " + response["Message"].AsString()); return GetRootFolder(userID); } } @@ -311,7 +311,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } } - m_log.Warn("[INVENTORY CONNECTOR]: Item " + item.ID + " owned by " + item.Owner + " not found"); + m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Item " + item.ID + " owned by " + item.Owner + " not found"); return null; } @@ -376,7 +376,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - m_log.Warn("[INVENTORY CONNECTOR]: Error fetching folder " + folderID + " content for " + userID + ": " + + m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Error fetching folder " + folderID + " content for " + userID + ": " + response["Message"].AsString()); inventory.Folders = new List(0); inventory.Items = new List(0); @@ -414,7 +414,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - m_log.Warn("[INVENTORY CONNECTOR]: Error fetching folder " + folderID + " for " + userID + ": " + + m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Error fetching folder " + folderID + " for " + userID + ": " + response["Message"].AsString()); return new List(0); } @@ -442,7 +442,7 @@ namespace OpenSim.Services.Connectors.SimianGrid if (!success) { - m_log.Warn("[INVENTORY CONNECTOR]: Error creating folder " + folder.Name + " for " + folder.Owner + ": " + + m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Error creating folder " + folder.Name + " for " + folder.Owner + ": " + response["Message"].AsString()); } @@ -506,7 +506,7 @@ namespace OpenSim.Services.Connectors.SimianGrid if (!success) { - m_log.Warn("[INVENTORY CONNECTOR]: Error removing item " + itemID + " for " + userID + ": " + + m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Error removing item " + itemID + " for " + userID + ": " + response["Message"].AsString()); allSuccess = false; } @@ -534,7 +534,7 @@ namespace OpenSim.Services.Connectors.SimianGrid if (!success) { - m_log.Warn("[INVENTORY CONNECTOR]: Error purging folder " + folder.ID + " for " + folder.Owner + ": " + + m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Error purging folder " + folder.ID + " for " + folder.Owner + ": " + response["Message"].AsString()); } @@ -562,7 +562,7 @@ namespace OpenSim.Services.Connectors.SimianGrid UpdateGesture(item.Owner, item.ID, item.Flags == 1); if (item.BasePermissions == 0) - m_log.WarnFormat("[INVENTORY CONNECTOR]: Adding inventory item {0} ({1}) with no base permissions", item.Name, item.ID); + m_log.WarnFormat("[SIMIAN INVENTORY CONNECTOR]: Adding inventory item {0} ({1}) with no base permissions", item.Name, item.ID); OSDMap permissions = new OSDMap { @@ -601,7 +601,7 @@ namespace OpenSim.Services.Connectors.SimianGrid if (!success) { - m_log.Warn("[INVENTORY CONNECTOR]: Error creating item " + item.Name + " for " + item.Owner + ": " + + m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Error creating item " + item.Name + " for " + item.Owner + ": " + response["Message"].AsString()); } @@ -785,7 +785,7 @@ namespace OpenSim.Services.Connectors.SimianGrid if (invItem.BasePermissions == 0) { - m_log.InfoFormat("[INVENTORY CONNECTOR]: Forcing item permissions to full for item {0} ({1})", + m_log.InfoFormat("[SIMIAN INVENTORY CONNECTOR]: Forcing item permissions to full for item {0} ({1})", invItem.Name, invItem.ID); invItem.BasePermissions = (uint)PermissionMask.All; invItem.CurrentPermissions = (uint)PermissionMask.All; @@ -820,7 +820,7 @@ namespace OpenSim.Services.Connectors.SimianGrid if (!success) { - m_log.Warn("[INVENTORY CONNECTOR]: Failed to move " + items.Count + " items to " + + m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Failed to move " + items.Count + " items to " + destFolderID + ": " + response["Message"].AsString()); } @@ -863,12 +863,12 @@ namespace OpenSim.Services.Connectors.SimianGrid if (gestures != null && gestures is OSDArray) return (OSDArray)gestures; else - m_log.Error("[INVENTORY CONNECTOR]: Unrecognized active gestures data for " + userID); + m_log.Error("[SIMIAN INVENTORY CONNECTOR]: Unrecognized active gestures data for " + userID); } } else { - m_log.Warn("[INVENTORY CONNECTOR]: Failed to fetch active gestures for " + userID + ": " + + m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Failed to fetch active gestures for " + userID + ": " + response["Message"].AsString()); } @@ -887,7 +887,7 @@ namespace OpenSim.Services.Connectors.SimianGrid OSDMap response = WebUtil.PostToService(m_userServerUrl, requestArgs); if (!response["Success"].AsBoolean()) { - m_log.Warn("[INVENTORY CONNECTOR]: Failed to save active gestures for " + userID + ": " + + m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Failed to save active gestures for " + userID + ": " + response["Message"].AsString()); } } diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs index f47bfbb..696be94 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs @@ -109,14 +109,14 @@ namespace OpenSim.Services.Connectors.SimianGrid IConfig gridConfig = source.Configs["PresenceService"]; if (gridConfig == null) { - m_log.Error("[PRESENCE CONNECTOR]: PresenceService missing from OpenSim.ini"); + m_log.Error("[SIMIAN PRESENCE CONNECTOR]: PresenceService missing from OpenSim.ini"); throw new Exception("Presence connector init error"); } string serviceUrl = gridConfig.GetString("PresenceServerURI"); if (String.IsNullOrEmpty(serviceUrl)) { - m_log.Error("[PRESENCE CONNECTOR]: No PresenceServerURI in section PresenceService"); + m_log.Error("[SIMIAN PRESENCE CONNECTOR]: No PresenceServerURI in section PresenceService"); throw new Exception("Presence connector init error"); } @@ -128,7 +128,7 @@ namespace OpenSim.Services.Connectors.SimianGrid public bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID) { - m_log.ErrorFormat("[PRESENCE CONNECTOR]: Login requested, UserID={0}, SessionID={1}, SecureSessionID={2}", + m_log.ErrorFormat("[SIMIAN PRESENCE CONNECTOR]: Login requested, UserID={0}, SessionID={1}, SecureSessionID={2}", userID, sessionID, secureSessionID); NameValueCollection requestArgs = new NameValueCollection @@ -146,14 +146,14 @@ namespace OpenSim.Services.Connectors.SimianGrid bool success = response["Success"].AsBoolean(); if (!success) - m_log.Warn("[PRESENCE CONNECTOR]: Failed to login agent " + userID + ": " + response["Message"].AsString()); + m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to login agent " + userID + ": " + response["Message"].AsString()); return success; } public bool LogoutAgent(UUID sessionID, Vector3 position, Vector3 lookAt) { - m_log.InfoFormat("[PRESENCE CONNECTOR]: Logout requested for agent with sessionID " + sessionID); + m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for agent with sessionID " + sessionID); NameValueCollection requestArgs = new NameValueCollection { @@ -165,14 +165,14 @@ namespace OpenSim.Services.Connectors.SimianGrid bool success = response["Success"].AsBoolean(); if (!success) - m_log.Warn("[PRESENCE CONNECTOR]: Failed to logout agent with sessionID " + sessionID + ": " + response["Message"].AsString()); + m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to logout agent with sessionID " + sessionID + ": " + response["Message"].AsString()); return success; } public bool LogoutRegionAgents(UUID regionID) { - m_log.InfoFormat("[PRESENCE CONNECTOR]: Logout requested for all agents in region " + regionID); + m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for all agents in region " + regionID); NameValueCollection requestArgs = new NameValueCollection { @@ -184,14 +184,14 @@ namespace OpenSim.Services.Connectors.SimianGrid bool success = response["Success"].AsBoolean(); if (!success) - m_log.Warn("[PRESENCE CONNECTOR]: Failed to logout agents from region " + regionID + ": " + response["Message"].AsString()); + m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to logout agents from region " + regionID + ": " + response["Message"].AsString()); return success; } public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt) { - //m_log.DebugFormat("[PRESENCE CONNECTOR]: Updating session data for agent with sessionID " + sessionID); + //m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Updating session data for agent with sessionID " + sessionID); NameValueCollection requestArgs = new NameValueCollection { @@ -206,14 +206,14 @@ namespace OpenSim.Services.Connectors.SimianGrid bool success = response["Success"].AsBoolean(); if (!success) - m_log.Warn("[PRESENCE CONNECTOR]: Failed to update agent session " + sessionID + ": " + response["Message"].AsString()); + m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to update agent session " + sessionID + ": " + response["Message"].AsString()); return success; } public PresenceInfo GetAgent(UUID sessionID) { - m_log.DebugFormat("[PRESENCE CONNECTOR]: Requesting session data for agent with sessionID " + sessionID); + m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent with sessionID " + sessionID); NameValueCollection requestArgs = new NameValueCollection { @@ -225,7 +225,7 @@ namespace OpenSim.Services.Connectors.SimianGrid if (sessionResponse["Success"].AsBoolean()) { UUID userID = sessionResponse["UserID"].AsUUID(); - m_log.DebugFormat("[PRESENCE CONNECTOR]: Requesting user data for " + userID); + m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID); requestArgs = new NameValueCollection { @@ -237,11 +237,11 @@ namespace OpenSim.Services.Connectors.SimianGrid if (userResponse["Success"].AsBoolean()) return ResponseToPresenceInfo(sessionResponse, userResponse); else - m_log.Warn("[PRESENCE CONNECTOR]: Failed to retrieve user data for " + userID + ": " + userResponse["Message"].AsString()); + m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for " + userID + ": " + userResponse["Message"].AsString()); } else { - m_log.Warn("[PRESENCE CONNECTOR]: Failed to retrieve session " + sessionID + ": " + sessionResponse["Message"].AsString()); + m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session " + sessionID + ": " + sessionResponse["Message"].AsString()); } return null; @@ -263,7 +263,7 @@ namespace OpenSim.Services.Connectors.SimianGrid public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt) { - m_log.DebugFormat("[PRESENCE CONNECTOR]: Setting home location for user " + userID); + m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Setting home location for user " + userID); NameValueCollection requestArgs = new NameValueCollection { @@ -276,7 +276,7 @@ namespace OpenSim.Services.Connectors.SimianGrid bool success = response["Success"].AsBoolean(); if (!success) - m_log.Warn("[PRESENCE CONNECTOR]: Failed to set home location for " + userID + ": " + response["Message"].AsString()); + m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to set home location for " + userID + ": " + response["Message"].AsString()); return success; } @@ -335,7 +335,7 @@ namespace OpenSim.Services.Connectors.SimianGrid private OSDMap GetUserData(UUID userID) { - m_log.DebugFormat("[PRESENCE CONNECTOR]: Requesting user data for " + userID); + m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID); NameValueCollection requestArgs = new NameValueCollection { @@ -347,14 +347,14 @@ namespace OpenSim.Services.Connectors.SimianGrid if (response["Success"].AsBoolean() && response["User"] is OSDMap) return response; else - m_log.Warn("[PRESENCE CONNECTOR]: Failed to retrieve user data for " + userID + ": " + response["Message"].AsString()); + m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for " + userID + ": " + response["Message"].AsString()); return null; } private OSDMap GetSessionData(UUID sessionID) { - m_log.DebugFormat("[PRESENCE CONNECTOR]: Requesting session data for session " + sessionID); + m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for session " + sessionID); NameValueCollection requestArgs = new NameValueCollection { @@ -366,7 +366,7 @@ namespace OpenSim.Services.Connectors.SimianGrid if (response["Success"].AsBoolean()) return response; else - m_log.Warn("[PRESENCE CONNECTOR]: Failed to retrieve session data for session " + sessionID); + m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session data for session " + sessionID); return null; } @@ -378,7 +378,7 @@ namespace OpenSim.Services.Connectors.SimianGrid OSDMap userResponse = GetUserData(userID); if (userResponse != null) { - m_log.DebugFormat("[PRESENCE CONNECTOR]: Requesting sessions for " + userID); + m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting sessions for " + userID); NameValueCollection requestArgs = new NameValueCollection { @@ -395,7 +395,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - m_log.Warn("[PRESENCE CONNECTOR]: Failed to retrieve sessions for " + userID + ": " + response["Message"].AsString()); + m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve sessions for " + userID + ": " + response["Message"].AsString()); } } @@ -428,7 +428,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - m_log.Warn("[PRESENCE CONNECTOR]: Failed to retrieve presence information for session " + sessionID + + m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve presence information for session " + sessionID + " while saving last location: " + response["Message"].AsString()); } @@ -448,7 +448,7 @@ namespace OpenSim.Services.Connectors.SimianGrid bool success = response["Success"].AsBoolean(); if (!success) - m_log.Warn("[PRESENCE CONNECTOR]: Failed to set last location for " + userID + ": " + response["Message"].AsString()); + m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to set last location for " + userID + ": " + response["Message"].AsString()); return success; } diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs index 0a36ae5..fbf4648 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs @@ -93,14 +93,14 @@ namespace OpenSim.Services.Connectors.SimianGrid IConfig gridConfig = source.Configs["UserAccountService"]; if (gridConfig == null) { - m_log.Error("[PROFILES]: UserAccountService missing from OpenSim.ini"); + m_log.Error("[SIMIAN PROFILES]: UserAccountService missing from OpenSim.ini"); throw new Exception("Profiles init error"); } string serviceUrl = gridConfig.GetString("UserAccountServerURI"); if (String.IsNullOrEmpty(serviceUrl)) { - m_log.Error("[PROFILES]: No UserAccountServerURI in section UserAccountService"); + m_log.Error("[SIMIAN PROFILES]: No UserAccountServerURI in section UserAccountService"); throw new Exception("Profiles init error"); } @@ -153,7 +153,7 @@ namespace OpenSim.Services.Connectors.SimianGrid UUID targetAvatarID; if (args.Count < 1 || !UUID.TryParse(args[0], out targetAvatarID)) { - m_log.Error("[PROFILES]: Unrecognized arguments for " + method); + m_log.Error("[SIMIAN PROFILES]: Unrecognized arguments for " + method); return; } @@ -193,7 +193,7 @@ namespace OpenSim.Services.Connectors.SimianGrid UUID targetAvatarID; if (args.Count < 1 || !UUID.TryParse(args[0], out targetAvatarID)) { - m_log.Error("[PROFILES]: Unrecognized arguments for " + method); + m_log.Error("[SIMIAN PROFILES]: Unrecognized arguments for " + method); return; } @@ -211,7 +211,7 @@ namespace OpenSim.Services.Connectors.SimianGrid UUID pickID; if (args.Count < 2 || !UUID.TryParse(args[0], out avatarID) || !UUID.TryParse(args[1], out pickID)) { - m_log.Error("[PROFILES]: Unrecognized arguments for " + method); + m_log.Error("[SIMIAN PROFILES]: Unrecognized arguments for " + method); return; } @@ -244,7 +244,7 @@ namespace OpenSim.Services.Connectors.SimianGrid UUID targetAvatarID; if (args.Count < 1 || !UUID.TryParse(args[0], out targetAvatarID)) { - m_log.Error("[PROFILES]: Unrecognized arguments for " + method); + m_log.Error("[SIMIAN PROFILES]: Unrecognized arguments for " + method); return; } @@ -305,7 +305,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - m_log.Warn("[PROFILES]: Failed to fetch profile information for " + client.Name + ", returning default values"); + m_log.Warn("[SIMIAN PROFILES]: Failed to fetch profile information for " + client.Name + ", returning default values"); client.SendAvatarProperties(avatarID, String.Empty, "1/1/1970", Utils.EmptyBytes, String.Empty, (uint)flags, UUID.Zero, UUID.Zero, String.Empty, UUID.Zero); } @@ -342,7 +342,7 @@ namespace OpenSim.Services.Connectors.SimianGrid private void UserInfoRequestHandler(IClientAPI client) { - m_log.Error("[PROFILES]: UserInfoRequestHandler"); + m_log.Error("[SIMIAN PROFILES]: UserInfoRequestHandler"); // Fetch this user's e-mail address NameValueCollection requestArgs = new NameValueCollection @@ -355,14 +355,14 @@ namespace OpenSim.Services.Connectors.SimianGrid string email = response["Email"].AsString(); if (!response["Success"].AsBoolean()) - m_log.Warn("[PROFILES]: GetUser failed during a user info request for " + client.Name); + m_log.Warn("[SIMIAN PROFILES]: GetUser failed during a user info request for " + client.Name); client.SendUserInfoReply(false, true, email); } private void UpdateUserInfoHandler(bool imViaEmail, bool visible, IClientAPI client) { - m_log.Info("[PROFILES]: Ignoring user info update from " + client.Name); + m_log.Info("[SIMIAN PROFILES]: Ignoring user info update from " + client.Name); } #endregion Profiles @@ -380,7 +380,7 @@ namespace OpenSim.Services.Connectors.SimianGrid UserAccount admin = scene.UserAccountService.GetUserAccount(scene.RegionInfo.ScopeID, UUID.Zero); if (admin != null) { - m_log.InfoFormat("[PROFILES]: Setting estate {0} (ID: {1}) owner to {2}", estate.EstateName, + m_log.InfoFormat("[SIMIAN PROFILES]: Setting estate {0} (ID: {1}) owner to {2}", estate.EstateName, estate.EstateID, admin.Name); estate.EstateOwner = admin.PrincipalID; @@ -388,7 +388,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - m_log.WarnFormat("[PROFILES]: Estate {0} (ID: {1}) does not have an owner", estate.EstateName, estate.EstateID); + m_log.WarnFormat("[SIMIAN PROFILES]: Estate {0} (ID: {1}) does not have an owner", estate.EstateName, estate.EstateID); } } } @@ -406,7 +406,7 @@ namespace OpenSim.Services.Connectors.SimianGrid bool success = response["Success"].AsBoolean(); if (!success) - m_log.WarnFormat("[PROFILES]: Failed to add user data with key {0} for {1}: {2}", key, userID, response["Message"].AsString()); + m_log.WarnFormat("[SIMIAN PROFILES]: Failed to add user data with key {0} for {1}: {2}", key, userID, response["Message"].AsString()); return success; } @@ -426,7 +426,7 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - m_log.Error("[PROFILES]: Failed to fetch user data for " + userID + ": " + response["Message"].AsString()); + m_log.Error("[SIMIAN PROFILES]: Failed to fetch user data for " + userID + ": " + response["Message"].AsString()); } return null; diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs index 491a9a2..874f1a2 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs @@ -82,14 +82,14 @@ namespace OpenSim.Services.Connectors.SimianGrid IConfig assetConfig = source.Configs["UserAccountService"]; if (assetConfig == null) { - m_log.Error("[ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini"); + m_log.Error("[SIMIAN ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini"); throw new Exception("User account connector init error"); } string serviceURI = assetConfig.GetString("UserAccountServerURI"); if (String.IsNullOrEmpty(serviceURI)) { - m_log.Error("[ACCOUNT CONNECTOR]: No UserAccountServerURI in section UserAccountService, skipping SimianUserAccountServiceConnector"); + m_log.Error("[SIMIAN ACCOUNT CONNECTOR]: No UserAccountServerURI in section UserAccountService, skipping SimianUserAccountServiceConnector"); throw new Exception("User account connector init error"); } @@ -140,7 +140,7 @@ namespace OpenSim.Services.Connectors.SimianGrid { List accounts = new List(); - m_log.DebugFormat("[ACCOUNT CONNECTOR]: Searching for user accounts with name query " + query); + m_log.DebugFormat("[SIMIAN ACCOUNT CONNECTOR]: Searching for user accounts with name query " + query); NameValueCollection requestArgs = new NameValueCollection { @@ -163,12 +163,12 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - m_log.Warn("[ACCOUNT CONNECTOR]: Account search failed, response data was in an invalid format"); + m_log.Warn("[SIMIAN ACCOUNT CONNECTOR]: Account search failed, response data was in an invalid format"); } } else { - m_log.Warn("[ACCOUNT CONNECTOR]: Failed to search for account data by name " + query); + m_log.Warn("[SIMIAN ACCOUNT CONNECTOR]: Failed to search for account data by name " + query); } return accounts; @@ -176,7 +176,7 @@ namespace OpenSim.Services.Connectors.SimianGrid public bool StoreUserAccount(UserAccount data) { - m_log.InfoFormat("[ACCOUNT CONNECTOR]: Storing user account for " + data.Name); + m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account for " + data.Name); NameValueCollection requestArgs = new NameValueCollection { @@ -191,7 +191,7 @@ namespace OpenSim.Services.Connectors.SimianGrid if (response["Success"].AsBoolean()) { - m_log.InfoFormat("[ACCOUNT CONNECTOR]: Storing user account data for " + data.Name); + m_log.InfoFormat("[SIMIAN ACCOUNT CONNECTOR]: Storing user account data for " + data.Name); requestArgs = new NameValueCollection { @@ -212,14 +212,14 @@ namespace OpenSim.Services.Connectors.SimianGrid } else { - m_log.Warn("[ACCOUNT CONNECTOR]: Failed to store user account data for " + data.Name + ": " + response["Message"].AsString()); + m_log.Warn("[SIMIAN ACCOUNT CONNECTOR]: Failed to store user account data for " + data.Name + ": " + response["Message"].AsString()); } return success; } else { - m_log.Warn("[ACCOUNT CONNECTOR]: Failed to store user account for " + data.Name + ": " + response["Message"].AsString()); + m_log.Warn("[SIMIAN ACCOUNT CONNECTOR]: Failed to store user account for " + data.Name + ": " + response["Message"].AsString()); } return false; @@ -233,7 +233,7 @@ namespace OpenSim.Services.Connectors.SimianGrid private UserAccount GetUser(NameValueCollection requestArgs) { string lookupValue = (requestArgs.Count > 1) ? requestArgs[1] : "(Unknown)"; - m_log.DebugFormat("[ACCOUNT CONNECTOR]: Looking up user account with query: " + lookupValue); + m_log.DebugFormat("[SIMIAN ACCOUNT CONNECTOR]: Looking up user account with query: " + lookupValue); OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); if (response["Success"].AsBoolean()) @@ -242,11 +242,11 @@ namespace OpenSim.Services.Connectors.SimianGrid if (user != null) return ResponseToUserAccount(user); else - m_log.Warn("[ACCOUNT CONNECTOR]: Account search failed, response data was in an invalid format"); + m_log.Warn("[SIMIAN ACCOUNT CONNECTOR]: Account search failed, response data was in an invalid format"); } else { - m_log.Warn("[ACCOUNT CONNECTOR]: Failed to lookup user account with query: " + lookupValue); + m_log.Warn("[SIMIAN ACCOUNT CONNECTOR]: Failed to lookup user account with query: " + lookupValue); } return null; -- cgit v1.1