From 06ecdf1967848e3f0c6b6f98aba61c7ad099f65d Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 18 Nov 2009 08:21:28 +0000 Subject: Tweak presence handling and whip up a database connector and handler for testign the new generic table handling --- OpenSim/Services/Interfaces/IPresenceService.cs | 2 +- OpenSim/Services/PresenceService/PresenceService.cs | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'OpenSim/Services') diff --git a/OpenSim/Services/Interfaces/IPresenceService.cs b/OpenSim/Services/Interfaces/IPresenceService.cs index 6ceeb45..aa1c5bf 100644 --- a/OpenSim/Services/Interfaces/IPresenceService.cs +++ b/OpenSim/Services/Interfaces/IPresenceService.cs @@ -35,7 +35,7 @@ namespace OpenSim.Services.Interfaces { public UUID PrincipalID; public UUID RegionID; - public Dictionary Data; + public Dictionary Data; } public interface IPresenceService diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs index 8931a26..2157462 100644 --- a/OpenSim/Services/PresenceService/PresenceService.cs +++ b/OpenSim/Services/PresenceService/PresenceService.cs @@ -52,6 +52,15 @@ namespace OpenSim.Services.PresenceService public bool Report(PresenceInfo presence) { + PresenceData p = new PresenceData(); + p.Data = new Dictionary(); + + p.UUID = presence.PrincipalID; + p.currentRegion = presence.RegionID; + + foreach (KeyValuePair kvp in presence.Data) + p.Data[kvp.Key] = kvp.Value; + return false; } } -- cgit v1.1 From 7166f3748a95909ce75f6e4e7bf62e4e87f05c5e Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 18 Nov 2009 18:44:47 +0000 Subject: minor: correct error messages when queryfolder fails --- OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'OpenSim/Services') diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs index e047f71..d1d0645 100644 --- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs @@ -475,7 +475,7 @@ namespace OpenSim.Services.Connectors } catch (Exception e) { - m_log.ErrorFormat("[INVENTORY CONNECTOR]: Query inventory item operation failed, {0} {1}", + m_log.ErrorFormat("[INVENTORY CONNECTOR]: Query inventory folder operation failed, {0} {1}", e.Source, e.Message); } @@ -576,9 +576,6 @@ namespace OpenSim.Services.Connectors } callback(folders, items); - } - - } } -- cgit v1.1 From e31e14162909556a5c646afec82adbae569e70ae Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 18 Nov 2009 18:57:15 +0000 Subject: minor: Correct some inventory corrector log messages and add more identifying detail --- .../Inventory/InventoryServiceConnector.cs | 39 +++++++++++----------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'OpenSim/Services') diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs index d1d0645..f86b453 100644 --- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs @@ -231,13 +231,14 @@ namespace OpenSim.Services.Connectors } catch (TimeoutException e) { - m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderContent operation to {0} timed out {0} {1}.", m_ServerURI, - e.Source, e.Message); + m_log.ErrorFormat( + "[INVENTORY CONNECTOR]: GetFolderContent operation to {0} for {1} timed out {2} {3}.", + m_ServerURI, folderID, e.Source, e.Message); } catch (Exception e) { - m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderContent operation failed, {0} {1} (old server?).", - e.Source, e.Message); + m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderContent operation failed for {0}, {1} {2} (old server?).", + folderID, e.Source, e.Message); } InventoryCollection nullCollection = new InventoryCollection(); @@ -256,8 +257,8 @@ namespace OpenSim.Services.Connectors } catch (Exception e) { - m_log.ErrorFormat("[INVENTORY CONNECTOR]: Add new inventory folder operation failed, {0} {1}", - e.Source, e.Message); + m_log.ErrorFormat("[INVENTORY CONNECTOR]: Add new inventory folder operation failed for {0} {1}, {2} {3}", + folder.Name, folder.ID, e.Source, e.Message); } return false; @@ -272,8 +273,8 @@ namespace OpenSim.Services.Connectors } catch (Exception e) { - m_log.ErrorFormat("[INVENTORY CONNECTOR]: Update inventory folder operation failed, {0} {1}", - e.Source, e.Message); + m_log.ErrorFormat("[INVENTORY CONNECTOR]: Update inventory folder operation failed for {0} {1}, {2} {3}", + folder.Name, folder.ID, e.Source, e.Message); } return false; @@ -307,8 +308,8 @@ namespace OpenSim.Services.Connectors } catch (Exception e) { - m_log.ErrorFormat("[INVENTORY CONNECTOR]: Move inventory folder operation failed, {0} {1}", - e.Source, e.Message); + m_log.ErrorFormat("[INVENTORY CONNECTOR]: Move inventory folder operation failed for {0} {1}, {2} {3}", + folder.Name, folder.ID, e.Source, e.Message); } return false; @@ -323,8 +324,8 @@ namespace OpenSim.Services.Connectors } catch (Exception e) { - m_log.ErrorFormat("[INVENTORY CONNECTOR]: Move inventory folder operation failed, {0} {1}", - e.Source, e.Message); + m_log.ErrorFormat("[INVENTORY CONNECTOR]: Purge inventory folder operation failed for {0} {1}, {2} {3}", + folder.Name, folder.ID, e.Source, e.Message); } return false; @@ -340,8 +341,8 @@ namespace OpenSim.Services.Connectors } catch (Exception e) { - m_log.ErrorFormat("[INVENTORY CONNECTOR]: Get folder items operation failed, {0} {1}", - e.Source, e.Message); + m_log.ErrorFormat("[INVENTORY CONNECTOR]: Get folder items operation failed for folder {0}, {1} {2}", + folderID, e.Source, e.Message); } return null; @@ -356,8 +357,8 @@ namespace OpenSim.Services.Connectors } catch (Exception e) { - m_log.ErrorFormat("[INVENTORY CONNECTOR]: Add new inventory item operation failed, {0} {1}", - e.Source, e.Message); + m_log.ErrorFormat("[INVENTORY CONNECTOR]: Add new inventory item operation failed for {0} {1}, {2} {3}", + item.Name, item.ID, e.Source, e.Message); } return false; @@ -372,8 +373,8 @@ namespace OpenSim.Services.Connectors } catch (Exception e) { - m_log.ErrorFormat("[INVENTORY CONNECTOR]: Update new inventory item operation failed, {0} {1}", - e.Source, e.Message); + m_log.ErrorFormat("[INVENTORY CONNECTOR]: Update new inventory item operation failed for {0} {1}, {2} {3}", + item.Name, item.ID, e.Source, e.Message); } return false; @@ -443,7 +444,7 @@ namespace OpenSim.Services.Connectors } catch (Exception e) { - m_log.ErrorFormat("[INVENTORY CONNECTOR]: Delete inventory item operation failed, {0} {1}", + m_log.ErrorFormat("[INVENTORY CONNECTOR]: Delete inventory items operation failed, {0} {1}", e.Source, e.Message); } -- cgit v1.1