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

Renamed IMessageUserServerService to IInterServiceUserService.cs 

Renamed MessageUserServerModule to InterMessageUserServerModule
GenericGridServerConcept
MW 2009-02-25 21:00:58 +00:00
parent 36e648a37a
commit 07ee252cf3
5 changed files with 229 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
OpenSim/Grid/Framework/IMessageUserServerService.cs → OpenSim/Grid/Framework/IInterServiceUserService.cs
View File

@ -1,35 +1,35 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the * * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * 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 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
namespace OpenSim.Grid.Framework namespace OpenSim.Grid.Framework
{ {
public interface IMessageUserServerService public interface IInterServiceUserService
{ {
bool SendToUserServer(System.Collections.Hashtable request, string method); bool SendToUserServer(System.Collections.Hashtable request, string method);
} }
} }

372
OpenSim/Grid/MessagingServer.Modules/MessageUserServerModule.cs → OpenSim/Grid/MessagingServer.Modules/InterMessageUserServerModule.cs
View File

@ -1,186 +1,186 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the * * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * 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 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
using System.Reflection; using System.Reflection;
using System.Threading; using System.Threading;
using System.Timers; using System.Timers;
using log4net; using log4net;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Data; using OpenSim.Data;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Grid.Framework; using OpenSim.Grid.Framework;
using Timer = System.Timers.Timer; using Timer = System.Timers.Timer;
namespace OpenSim.Grid.MessagingServer.Modules namespace OpenSim.Grid.MessagingServer.Modules
{ {
public class MessageUserServerModule : IMessageUserServerService public class InterMessageUserServerModule : IInterServiceUserService
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private MessageServerConfig m_cfg; private MessageServerConfig m_cfg;
private IGridServiceCore m_messageCore; private IGridServiceCore m_messageCore;
private Timer reconnectTimer = new Timer(300000); // 5 mins private Timer reconnectTimer = new Timer(300000); // 5 mins
public MessageUserServerModule(MessageServerConfig config, IGridServiceCore messageCore) public InterMessageUserServerModule(MessageServerConfig config, IGridServiceCore messageCore)
{ {
m_cfg = config; m_cfg = config;
m_messageCore = messageCore; m_messageCore = messageCore;
reconnectTimer.Elapsed += registerWithUserServer; reconnectTimer.Elapsed += registerWithUserServer;
reconnectTimer.Start(); reconnectTimer.Start();
} }
public void Initialise() public void Initialise()
{ {
m_messageCore.RegisterInterface<IMessageUserServerService>(this); m_messageCore.RegisterInterface<IInterServiceUserService>(this);
} }
public void PostInitialise() public void PostInitialise()
{ {
} }
public void RegisterHandlers() public void RegisterHandlers()
{ {
//have these in separate method as some servers restart the http server and reregister all the handlers. //have these in separate method as some servers restart the http server and reregister all the handlers.
} }
public void registerWithUserServer(object sender, ElapsedEventArgs e) public void registerWithUserServer(object sender, ElapsedEventArgs e)
{ {
registerWithUserServer(); registerWithUserServer();
} }
public bool registerWithUserServer() public bool registerWithUserServer()
{ {
Hashtable UserParams = new Hashtable(); Hashtable UserParams = new Hashtable();
// Login / Authentication // Login / Authentication
if (m_cfg.HttpSSL) if (m_cfg.HttpSSL)
{ {
UserParams["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; UserParams["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
} }
else else
{ {
UserParams["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; UserParams["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
} }
UserParams["recvkey"] = m_cfg.UserRecvKey; UserParams["recvkey"] = m_cfg.UserRecvKey;
UserParams["sendkey"] = m_cfg.UserRecvKey; UserParams["sendkey"] = m_cfg.UserRecvKey;
// Package into an XMLRPC Request // Package into an XMLRPC Request
ArrayList SendParams = new ArrayList(); ArrayList SendParams = new ArrayList();
SendParams.Add(UserParams); SendParams.Add(UserParams);
bool success = true; bool success = true;
string[] servers = m_cfg.UserServerURL.Split(' '); string[] servers = m_cfg.UserServerURL.Split(' ');
foreach (string srv in servers) foreach (string srv in servers)
{ {
// Send Request // Send Request
try try
{ {
XmlRpcRequest UserReq = new XmlRpcRequest("register_messageserver", SendParams); XmlRpcRequest UserReq = new XmlRpcRequest("register_messageserver", SendParams);
XmlRpcResponse UserResp = UserReq.Send(srv, 16000); XmlRpcResponse UserResp = UserReq.Send(srv, 16000);
// Process Response // Process Response
Hashtable GridRespData = (Hashtable)UserResp.Value; Hashtable GridRespData = (Hashtable)UserResp.Value;
// if we got a response, we were successful // if we got a response, we were successful
if (!GridRespData.ContainsKey("responsestring")) if (!GridRespData.ContainsKey("responsestring"))
success = false; success = false;
else else
m_log.InfoFormat("[SERVER] Registered with {0}", srv); m_log.InfoFormat("[SERVER] Registered with {0}", srv);
} }
catch catch
{ {
m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv); m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv);
success = false; success = false;
} }
} }
return success; return success;
} }
public bool deregisterWithUserServer() public bool deregisterWithUserServer()
{ {
Hashtable request = new Hashtable(); Hashtable request = new Hashtable();
return SendToUserServer(request, "deregister_messageserver"); return SendToUserServer(request, "deregister_messageserver");
} }
public bool SendToUserServer(Hashtable request, string method) public bool SendToUserServer(Hashtable request, string method)
{ {
// Login / Authentication // Login / Authentication
if (m_cfg.HttpSSL) if (m_cfg.HttpSSL)
{ {
request["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; request["uri"] = "https://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
} }
else else
{ {
request["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort; request["uri"] = "http://" + m_cfg.MessageServerIP + ":" + m_cfg.HttpPort;
} }
request["recvkey"] = m_cfg.UserRecvKey; request["recvkey"] = m_cfg.UserRecvKey;
request["sendkey"] = m_cfg.UserRecvKey; request["sendkey"] = m_cfg.UserRecvKey;
// Package into an XMLRPC Request // Package into an XMLRPC Request
ArrayList SendParams = new ArrayList(); ArrayList SendParams = new ArrayList();
SendParams.Add(request); SendParams.Add(request);
bool success = true; bool success = true;
string[] servers = m_cfg.UserServerURL.Split(' '); string[] servers = m_cfg.UserServerURL.Split(' ');
// Send Request // Send Request
foreach (string srv in servers) foreach (string srv in servers)
{ {
try try
{ {
XmlRpcRequest UserReq = new XmlRpcRequest(method, SendParams); XmlRpcRequest UserReq = new XmlRpcRequest(method, SendParams);
XmlRpcResponse UserResp = UserReq.Send(m_cfg.UserServerURL, 16000); XmlRpcResponse UserResp = UserReq.Send(m_cfg.UserServerURL, 16000);
// Process Response // Process Response
Hashtable UserRespData = (Hashtable)UserResp.Value; Hashtable UserRespData = (Hashtable)UserResp.Value;
// if we got a response, we were successful // if we got a response, we were successful
if (!UserRespData.ContainsKey("responsestring")) if (!UserRespData.ContainsKey("responsestring"))
success = false; success = false;
} }
catch catch
{ {
m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv); m_log.ErrorFormat("Unable to connect to server {0}. Server not running?", srv);
success = false; success = false;
} }
} }
return success; return success;
} }
} }
} }

6
OpenSim/Grid/MessagingServer.Modules/MessageRegionModule.cs
View File

@ -48,7 +48,7 @@ namespace OpenSim.Grid.MessagingServer.Modules
private MessageServerConfig m_cfg; private MessageServerConfig m_cfg;
private IMessageUserServerService m_userServerModule; private IInterServiceUserService m_userServerModule;
private IGridServiceCore m_messageCore; private IGridServiceCore m_messageCore;
@ -68,8 +68,8 @@ namespace OpenSim.Grid.MessagingServer.Modules
public void PostInitialise() public void PostInitialise()
{ {
IMessageUserServerService messageUserServer; IInterServiceUserService messageUserServer;
if (m_messageCore.TryGet<IMessageUserServerService>(out messageUserServer)) if (m_messageCore.TryGet<IInterServiceUserService>(out messageUserServer))
{ {
m_userServerModule = messageUserServer; m_userServerModule = messageUserServer;
} }

6
OpenSim/Grid/MessagingServer.Modules/MessageService.cs
View File

@ -51,7 +51,7 @@ namespace OpenSim.Grid.MessagingServer.Modules
private IGridServiceCore m_messageCore; private IGridServiceCore m_messageCore;
private IMessageUserServerService m_userServerModule; private IInterServiceUserService m_userServerModule;
private IMessageRegionLookup m_regionModule; private IMessageRegionLookup m_regionModule;
// a dictionary of all current presences this server knows about // a dictionary of all current presences this server knows about
@ -76,8 +76,8 @@ namespace OpenSim.Grid.MessagingServer.Modules
public void PostInitialise() public void PostInitialise()
{ {
IMessageUserServerService messageUserServer; IInterServiceUserService messageUserServer;
if (m_messageCore.TryGet<IMessageUserServerService>(out messageUserServer)) if (m_messageCore.TryGet<IInterServiceUserService>(out messageUserServer))
{ {
m_userServerModule = messageUserServer; m_userServerModule = messageUserServer;
} }

4
OpenSim/Grid/MessagingServer/Main.cs
View File

@ -49,7 +49,7 @@ namespace OpenSim.Grid.MessagingServer
private MessageService msgsvc; private MessageService msgsvc;
private MessageRegionModule m_regionModule; private MessageRegionModule m_regionModule;
private MessageUserServerModule m_userServerModule; private InterMessageUserServerModule m_userServerModule;
private UserDataBaseService m_userDataBaseService; private UserDataBaseService m_userDataBaseService;
@ -132,7 +132,7 @@ namespace OpenSim.Grid.MessagingServer
//Register the database access service so modules can fetch it //Register the database access service so modules can fetch it
// RegisterInterface<UserDataBaseService>(m_userDataBaseService); // RegisterInterface<UserDataBaseService>(m_userDataBaseService);
m_userServerModule = new MessageUserServerModule(Cfg, this); m_userServerModule = new InterMessageUserServerModule(Cfg, this);
m_userServerModule.Initialise(); m_userServerModule.Initialise();
msgsvc = new MessageService(Cfg, this, m_userDataBaseService); msgsvc = new MessageService(Cfg, this, m_userDataBaseService);