mirror of
https://github.com/opensim/opensim.git
synced 2026-08-07 01:35:46 +08:00
moving GridInfo application plugin into a common standalone/grid
service, adding a plain REST GET handler returning XML (no LLSD), adding appropriate add handler calls to OpenSimBase and UserServer.
This commit is contained in:
@@ -39,6 +39,7 @@ using OpenSim.Framework.Communications.Cache;
|
||||
using OpenSim.Framework.Console;
|
||||
using OpenSim.Framework.Servers;
|
||||
using OpenSim.Framework.Statistics;
|
||||
using OpenSim.Common.Communications;
|
||||
using OpenSim.Grid.Communications.OGS1;
|
||||
|
||||
namespace OpenSim.Grid.UserServer
|
||||
@@ -53,6 +54,7 @@ namespace OpenSim.Grid.UserServer
|
||||
|
||||
public UserManager m_userManager;
|
||||
public UserLoginService m_loginService;
|
||||
public GridInfoService m_gridInfoService;
|
||||
public MessageServersConnector m_messagesService;
|
||||
protected IInterServiceInventoryServices m_interServiceInventoryService;
|
||||
|
||||
@@ -100,6 +102,8 @@ namespace OpenSim.Grid.UserServer
|
||||
m_userManager._config = Cfg;
|
||||
m_userManager.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect);
|
||||
|
||||
m_gridInfoService = new GridInfoService();
|
||||
|
||||
m_interServiceInventoryService = new OGS1InterServiceInventoryService(m_userManager._config.InventoryUrl);
|
||||
|
||||
m_loginService = new UserLoginService(
|
||||
@@ -148,6 +152,9 @@ namespace OpenSim.Grid.UserServer
|
||||
m_httpServer.AddXmlRPCHandler("agent_change_region", m_messagesService.XmlRPCUserMovedtoRegion);
|
||||
m_httpServer.AddXmlRPCHandler("deregister_messageserver", m_messagesService.XmlRPCDeRegisterMessageServer);
|
||||
|
||||
m_httpServer.AddStreamHandler(new RestStreamHandler("GET", "/get_grid_info", m_gridInfoService.RestGetGridInfoMethod));
|
||||
m_httpServer.AddXmlRPCHandler("get_grid_info", m_gridInfoService.XmlRpcGridInfoMethod);
|
||||
|
||||
|
||||
m_httpServer.AddStreamHandler(
|
||||
new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod));
|
||||
|
||||
Reference in New Issue
Block a user