diff options
Added GridServerPlugin class (which implements IGridPlugin) to OpenSim.Grid.GridServer.Modules.
This class handles all the initialising of the grid server.
And made GridServer into basically a generic server that just loads plugins.
So this is a step towards having a generic server that loads service modules.
Diffstat (limited to 'OpenSim/Grid/GridServer.Modules')
-rw-r--r-- | OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs | 147 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer.Modules/Resources/GridServer.Modules.addin.xml | 11 |
2 files changed, 158 insertions, 0 deletions
diff --git a/OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs b/OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs new file mode 100644 index 0000000..fd7f4c1 --- /dev/null +++ b/OpenSim/Grid/GridServer.Modules/GridServerPlugin.cs | |||
@@ -0,0 +1,147 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Reflection; | ||
4 | using System.Text; | ||
5 | using log4net; | ||
6 | using OpenSim.Framework; | ||
7 | using OpenSim.Framework.Console; | ||
8 | using OpenSim.Grid.Framework; | ||
9 | using OpenSim.Grid; | ||
10 | |||
11 | namespace OpenSim.Grid.GridServer.Modules | ||
12 | { | ||
13 | public class GridServerPlugin : IGridPlugin | ||
14 | { | ||
15 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
16 | |||
17 | protected GridXmlRpcModule m_gridXmlRpcModule; | ||
18 | protected GridMessagingModule m_gridMessageModule; | ||
19 | protected GridRestModule m_gridRestModule; | ||
20 | |||
21 | protected GridDBService m_gridDBService; | ||
22 | |||
23 | protected string m_version; | ||
24 | |||
25 | protected GridConfig m_config; | ||
26 | |||
27 | protected IGridServiceCore m_core; | ||
28 | |||
29 | protected ConsoleBase m_console; | ||
30 | |||
31 | #region IGridPlugin Members | ||
32 | |||
33 | public void Initialise(GridServerBase gridServer) | ||
34 | { | ||
35 | m_core = gridServer; | ||
36 | m_config = gridServer.Config; | ||
37 | m_version = gridServer.Version; | ||
38 | m_console = MainConsole.Instance; | ||
39 | |||
40 | AddConsoleCommands(); | ||
41 | |||
42 | SetupGridServices(); | ||
43 | } | ||
44 | |||
45 | #endregion | ||
46 | |||
47 | #region IPlugin Members | ||
48 | |||
49 | public string Version | ||
50 | { | ||
51 | get { return "0.0"; } | ||
52 | } | ||
53 | |||
54 | public string Name | ||
55 | { | ||
56 | get { return "GridServerPlugin"; } | ||
57 | } | ||
58 | |||
59 | public void Initialise() | ||
60 | { | ||
61 | |||
62 | } | ||
63 | |||
64 | #endregion | ||
65 | |||
66 | protected virtual void SetupGridServices() | ||
67 | { | ||
68 | // m_log.Info("[DATA]: Connecting to Storage Server"); | ||
69 | m_gridDBService = new GridDBService(); | ||
70 | m_gridDBService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect); | ||
71 | |||
72 | //Register the database access service so modules can fetch it | ||
73 | // RegisterInterface<GridDBService>(m_gridDBService); | ||
74 | |||
75 | m_gridMessageModule = new GridMessagingModule(); | ||
76 | m_gridMessageModule.Initialise(m_version, m_gridDBService, m_core, m_config); | ||
77 | |||
78 | m_gridXmlRpcModule = new GridXmlRpcModule(); | ||
79 | m_gridXmlRpcModule.Initialise(m_version, m_gridDBService, m_core, m_config); | ||
80 | |||
81 | m_gridRestModule = new GridRestModule(); | ||
82 | m_gridRestModule.Initialise(m_version, m_gridDBService, m_core, m_config); | ||
83 | |||
84 | m_gridMessageModule.PostInitialise(); | ||
85 | m_gridXmlRpcModule.PostInitialise(); | ||
86 | m_gridRestModule.PostInitialise(); | ||
87 | } | ||
88 | |||
89 | #region Console Command Handlers | ||
90 | |||
91 | protected virtual void AddConsoleCommands() | ||
92 | { | ||
93 | m_console.Commands.AddCommand("gridserver", false, | ||
94 | "enable registration", | ||
95 | "enable registration", | ||
96 | "Enable new regions to register", HandleRegistration); | ||
97 | |||
98 | m_console.Commands.AddCommand("gridserver", false, | ||
99 | "disable registration", | ||
100 | "disable registration", | ||
101 | "Disable registering new regions", HandleRegistration); | ||
102 | |||
103 | m_console.Commands.AddCommand("gridserver", false, "show status", | ||
104 | "show status", | ||
105 | "Show registration status", HandleShowStatus); | ||
106 | } | ||
107 | |||
108 | private void HandleRegistration(string module, string[] cmd) | ||
109 | { | ||
110 | switch (cmd[0]) | ||
111 | { | ||
112 | case "enable": | ||
113 | m_config.AllowRegionRegistration = true; | ||
114 | m_log.Info("Region registration enabled"); | ||
115 | break; | ||
116 | case "disable": | ||
117 | m_config.AllowRegionRegistration = false; | ||
118 | m_log.Info("Region registration disabled"); | ||
119 | break; | ||
120 | } | ||
121 | } | ||
122 | |||
123 | private void HandleShowStatus(string module, string[] cmd) | ||
124 | { | ||
125 | if (m_config.AllowRegionRegistration) | ||
126 | { | ||
127 | m_log.Info("Region registration enabled."); | ||
128 | } | ||
129 | else | ||
130 | { | ||
131 | m_log.Info("Region registration disabled."); | ||
132 | } | ||
133 | } | ||
134 | |||
135 | #endregion | ||
136 | |||
137 | |||
138 | |||
139 | #region IDisposable Members | ||
140 | |||
141 | public void Dispose() | ||
142 | { | ||
143 | } | ||
144 | |||
145 | #endregion | ||
146 | } | ||
147 | } | ||
diff --git a/OpenSim/Grid/GridServer.Modules/Resources/GridServer.Modules.addin.xml b/OpenSim/Grid/GridServer.Modules/Resources/GridServer.Modules.addin.xml new file mode 100644 index 0000000..c2c5ac3 --- /dev/null +++ b/OpenSim/Grid/GridServer.Modules/Resources/GridServer.Modules.addin.xml | |||
@@ -0,0 +1,11 @@ | |||
1 | <Addin id="OpenSim.Grid.GridServer.Modules" version="0.1"> | ||
2 | <Runtime> | ||
3 | <Import assembly="OpenSim.Grid.GridServer.Modules.dll"/> | ||
4 | </Runtime> | ||
5 | <Dependencies> | ||
6 | <Addin id="OpenSim.Grid.GridServer" version="0.5" /> | ||
7 | </Dependencies> | ||
8 | <Extension path = "/OpenSim/GridServer"> | ||
9 | <Plugin id="GridServerModules" type="OpenSim.Grid.GridServer.Modules.GridServerPlugin" /> | ||
10 | </Extension> | ||
11 | </Addin> | ||