From 08b507517b8dc33f66de1e0815af330bb3c54696 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 2 Jan 2010 18:18:13 -0800 Subject: Test client for remote presence connector, and for the service itself. Connector seems to work well. --- .../Handlers/Presence/PresenceServerPostHandler.cs | 2 +- .../Services/PresenceService/PresenceService.cs | 6 +- .../PresenceService/PresenceServiceBase.cs | 2 +- OpenSim/Tests/Clients/Presence/OpenSim.Server.ini | 33 ++++++ OpenSim/Tests/Clients/Presence/PresenceClient.cs | 128 +++++++++++++++++++++ 5 files changed, 167 insertions(+), 4 deletions(-) create mode 100644 OpenSim/Tests/Clients/Presence/OpenSim.Server.ini create mode 100644 OpenSim/Tests/Clients/Presence/PresenceClient.cs (limited to 'OpenSim') diff --git a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs index 11adc4a..6e47b22 100644 --- a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs @@ -312,7 +312,7 @@ namespace OpenSim.Server.Handlers.Presence Vector3 position = new Vector3(128, 128, 70); Vector3 look = Vector3.Zero; - if (!request.ContainsKey("SessionID") || !request.ContainsKey("RegionID")) + if (!request.ContainsKey("UserID") || !request.ContainsKey("RegionID")) return FailureResult(); string user = request["UserID"].ToString(); diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs index 7da0f23..2884199 100644 --- a/OpenSim/Services/PresenceService/PresenceService.cs +++ b/OpenSim/Services/PresenceService/PresenceService.cs @@ -82,6 +82,8 @@ namespace OpenSim.Services.PresenceService m_Database.Store(data); + m_log.DebugFormat("[PRESENCE SERVICE]: LoginAgent {0} with session {1} and ssession {2}", + userID, sessionID, secureSessionID); return true; } @@ -93,7 +95,7 @@ namespace OpenSim.Services.PresenceService PresenceData[] d = m_Database.Get("UserID", data.UserID); - m_log.WarnFormat("[PRESENCE SERVICE]: LogoutAgent {0} with {1} sessions currently present", data.UserID, d.Length); + m_log.DebugFormat("[PRESENCE SERVICE]: LogoutAgent {0} with {1} sessions currently present", data.UserID, d.Length); if (d.Length > 1) { m_Database.Delete("UserID", data.UserID); @@ -117,7 +119,7 @@ namespace OpenSim.Services.PresenceService public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt) { - m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent with session {0} in region {1}", sessionID, regionID); + //m_log.DebugFormat("[PRESENCE SERVICE]: ReportAgent with session {0} in region {1}", sessionID, regionID); try { PresenceData pdata = m_Database.Get(sessionID); diff --git a/OpenSim/Services/PresenceService/PresenceServiceBase.cs b/OpenSim/Services/PresenceService/PresenceServiceBase.cs index 3ca70c1..86fd103 100644 --- a/OpenSim/Services/PresenceService/PresenceServiceBase.cs +++ b/OpenSim/Services/PresenceService/PresenceServiceBase.cs @@ -77,7 +77,7 @@ namespace OpenSim.Services.PresenceService m_Database = LoadPlugin(dllName, new Object[] { connString, realm }); if (m_Database == null) - throw new Exception("Could not find a storage interface in the given module"); + throw new Exception("Could not find a storage interface in the given module " + dllName); } } diff --git a/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini b/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini new file mode 100644 index 0000000..47e73f9 --- /dev/null +++ b/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini @@ -0,0 +1,33 @@ +; * Run a ROBUST server shell like this, from bin: +; * $ OpenSim.Server.exe -inifile ../OpenSim/Tests/Clients/Presence/OpenSim.Server.ini +; * +; * Then run this client like this, from bin: +; * $ OpenSim.Tests.Clients.PresenceClient.exe +; * +; * + +[Startup] +ServiceConnectors = "OpenSim.Server.Handlers.dll:PresenceServiceConnector" + +; * This is common for all services, it's the network setup for the entire +; * server instance +; * +[Network] +port = 8003 + +; * The following are for the remote console +; * They have no effect for the local or basic console types +; * Leave commented to diable logins to the console +;ConsoleUser = Test +;ConsolePass = secret + +; * As an example, the below configuration precisely mimicks the legacy +; * asset server. It is read by the asset IN connector (defined above) +; * and it then loads the OUT connector (a local database module). That, +; * in turn, reads the asset loader and database connection information +; * +[PresenceService] + LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService" + StorageProvider = "OpenSim.Data.MySQL.dll" + ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;" + diff --git a/OpenSim/Tests/Clients/Presence/PresenceClient.cs b/OpenSim/Tests/Clients/Presence/PresenceClient.cs new file mode 100644 index 0000000..3416804 --- /dev/null +++ b/OpenSim/Tests/Clients/Presence/PresenceClient.cs @@ -0,0 +1,128 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; +using System.Collections.Generic; +using System.Text; +using System.Reflection; + +using OpenMetaverse; +using log4net; +using log4net.Appender; +using log4net.Layout; + +using OpenSim.Framework; +using OpenSim.Services.Interfaces; +using OpenSim.Services.Connectors; + +namespace OpenSim.Tests.Clients.PresenceClient +{ + public class PresenceClient + { + private static readonly ILog m_log = + LogManager.GetLogger( + MethodBase.GetCurrentMethod().DeclaringType); + + public static void Main(string[] args) + { + ConsoleAppender consoleAppender = new ConsoleAppender(); + consoleAppender.Layout = + new PatternLayout("%date [%thread] %-5level %logger [%property{NDC}] - %message%newline"); + log4net.Config.BasicConfigurator.Configure(consoleAppender); + + string serverURI = "http://127.0.0.1:8003"; + PresenceServicesConnector m_Connector = new PresenceServicesConnector(serverURI); + + UUID user1 = UUID.Random(); + UUID session1 = UUID.Random(); + UUID region1 = UUID.Random(); + + bool success = m_Connector.LoginAgent(user1.ToString(), session1, UUID.Zero); + if (success) + m_log.InfoFormat("[PRESENCE CLIENT]: Successfully logged in user {0} with session {1}", user1, session1); + else + m_log.InfoFormat("[PRESENCE CLIENT]: failed to login user {0}", user1); + + System.Console.WriteLine("\n"); + + PresenceInfo pinfo = m_Connector.GetAgent(session1); + if (pinfo == null) + m_log.InfoFormat("[PRESENCE CLIENT]: Unable to retrieve presence for {0}", user1); + else + m_log.InfoFormat("[PRESENCE CLIENT]: Presence retrieved correctly: userID={0}; Online={1}; regionID={2}; homeRegion={3}", + pinfo.UserID, pinfo.Online, pinfo.RegionID, pinfo.HomeRegionID); + + System.Console.WriteLine("\n"); + success = m_Connector.ReportAgent(session1, region1, new Vector3(128, 128, 128), new Vector3(4, 5, 6)); + if (success) + m_log.InfoFormat("[PRESENCE CLIENT]: Successfully reported session {0} in region {1}", user1, region1); + else + m_log.InfoFormat("[PRESENCE CLIENT]: failed to report session {0}", session1); + pinfo = m_Connector.GetAgent(session1); + if (pinfo == null) + m_log.InfoFormat("[PRESENCE CLIENT]: Unable to retrieve presence for {0} for second time", user1); + else + m_log.InfoFormat("[PRESENCE CLIENT]: Presence retrieved correctly: userID={0}; Online={1}; regionID={2}; homeRegion={3}", + pinfo.UserID, pinfo.Online, pinfo.RegionID, pinfo.HomeRegionID); + + System.Console.WriteLine("\n"); + success = m_Connector.SetHomeLocation(user1.ToString(), region1, new Vector3(128, 128, 128), new Vector3(4, 5, 6)); + if (success) + m_log.InfoFormat("[PRESENCE CLIENT]: Successfully set home for user {0} in region {1}", user1, region1); + else + m_log.InfoFormat("[PRESENCE CLIENT]: failed to set home for user {0}", user1); + pinfo = m_Connector.GetAgent(session1); + if (pinfo == null) + m_log.InfoFormat("[PRESENCE CLIENT]: Unable to retrieve presence for {0} for third time", user1); + else + m_log.InfoFormat("[PRESENCE CLIENT]: Presence retrieved correctly: userID={0}; Online={1}; regionID={2}; homeRegion={3}", + pinfo.UserID, pinfo.Online, pinfo.RegionID, pinfo.HomeRegionID); + + System.Console.WriteLine("\n"); + success = m_Connector.LogoutAgent(session1); + if (success) + m_log.InfoFormat("[PRESENCE CLIENT]: Successfully logged out user {0}", user1); + else + m_log.InfoFormat("[PRESENCE CLIENT]: failed to logout user {0}", user1); + pinfo = m_Connector.GetAgent(session1); + if (pinfo == null) + m_log.InfoFormat("[PRESENCE CLIENT]: Unable to retrieve presence for {0} for fourth time", user1); + else + m_log.InfoFormat("[PRESENCE CLIENT]: Presence retrieved correctly: userID={0}; Online={1}; regionID={2}; homeRegion={3}", + pinfo.UserID, pinfo.Online, pinfo.RegionID, pinfo.HomeRegionID); + + System.Console.WriteLine("\n"); + success = m_Connector.ReportAgent(session1, UUID.Random(), Vector3.Zero, Vector3.Zero); + if (success) + m_log.InfoFormat("[PRESENCE CLIENT]: Report agent succeeded, but this is wrong"); + else + m_log.InfoFormat("[PRESENCE CLIENT]: failed to report agent, as it should because user is not logged in"); + + } + + } +} -- cgit v1.1