aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMichael Cortez2009-08-05 14:56:48 -0700
committerMichael Cortez2009-08-05 14:56:48 -0700
commitc73a6ab7e01efd07f68798de8b402343bef12de4 (patch)
treeb8e55dca9d63ce90b6f0a15afd24145c1b240a06
parentFixes mono Add-In references for the OptionalModules add-in so that groups do... (diff)
downloadopensim-SC_OLD-c73a6ab7e01efd07f68798de8b402343bef12de4.zip
opensim-SC_OLD-c73a6ab7e01efd07f68798de8b402343bef12de4.tar.gz
opensim-SC_OLD-c73a6ab7e01efd07f68798de8b402343bef12de4.tar.bz2
opensim-SC_OLD-c73a6ab7e01efd07f68798de8b402343bef12de4.tar.xz
Continue with renaming of Groups module components
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs27
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs27
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs2
-rw-r--r--bin/OpenSim.ini.example37
4 files changed, 51 insertions, 42 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
index f7883da..0bfb8e7 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
59 59
60 private IGroupsModule m_groupsModule = null; 60 private IGroupsModule m_groupsModule = null;
61 61
62 // TODO: Move this off to the xmlrpc server 62 // TODO: Move this off to the Groups Server
63 public Dictionary<Guid, List<Guid>> m_agentsInGroupSession = new Dictionary<Guid, List<Guid>>(); 63 public Dictionary<Guid, List<Guid>> m_agentsInGroupSession = new Dictionary<Guid, List<Guid>>();
64 public Dictionary<Guid, List<Guid>> m_agentsDroppedSession = new Dictionary<Guid, List<Guid>>(); 64 public Dictionary<Guid, List<Guid>> m_agentsDroppedSession = new Dictionary<Guid, List<Guid>>();
65 65
@@ -81,31 +81,28 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
81 } 81 }
82 else 82 else
83 { 83 {
84 if (!groupsConfig.GetBoolean("Enabled", false)) 84 // if groups aren't enabled, we're not needed.
85 { 85 // if we're not specified as the connector to use, then we're not wanted
86 return; 86 if ((groupsConfig.GetBoolean("Enabled", false) == false)
87 } 87 || (groupsConfig.GetString("MessagingModule", "Default") != Name))
88
89 if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups")
90 { 88 {
91 m_groupMessagingEnabled = false; 89 m_groupMessagingEnabled = false;
92
93 return; 90 return;
94 } 91 }
95 92
96 m_groupMessagingEnabled = groupsConfig.GetBoolean("XmlRpcMessagingEnabled", true); 93 m_groupMessagingEnabled = groupsConfig.GetBoolean("MessagingEnabled", true);
97 94
98 if (!m_groupMessagingEnabled) 95 if (!m_groupMessagingEnabled)
99 { 96 {
100 return; 97 return;
101 } 98 }
102 99
103 m_log.Info("[GROUPS-MESSAGING]: Initializing XmlRpcGroupsMessaging"); 100 m_log.Info("[GROUPS-MESSAGING]: Initializing GroupsMessagingModule");
104 101
105 m_debugEnabled = groupsConfig.GetBoolean("XmlRpcDebugEnabled", true); 102 m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true);
106 } 103 }
107 104
108 m_log.Info("[GROUPS-MESSAGING]: XmlRpcGroupsMessaging starting up"); 105 m_log.Info("[GROUPS-MESSAGING]: GroupsMessagingModule starting up");
109 106
110 } 107 }
111 108
@@ -125,7 +122,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
125 // No groups module, no groups messaging 122 // No groups module, no groups messaging
126 if (m_groupsModule == null) 123 if (m_groupsModule == null)
127 { 124 {
128 m_log.Error("[GROUPS-MESSAGING]: Could not get IGroupsModule, XmlRpcGroupsMessaging is now disabled."); 125 m_log.Error("[GROUPS-MESSAGING]: Could not get IGroupsModule, GroupsMessagingModule is now disabled.");
129 Close(); 126 Close();
130 m_groupMessagingEnabled = false; 127 m_groupMessagingEnabled = false;
131 return; 128 return;
@@ -165,7 +162,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
165 if (!m_groupMessagingEnabled) 162 if (!m_groupMessagingEnabled)
166 return; 163 return;
167 164
168 if (m_debugEnabled) m_log.Debug("[GROUPS-MESSAGING]: Shutting down XmlRpcGroupsMessaging module."); 165 if (m_debugEnabled) m_log.Debug("[GROUPS-MESSAGING]: Shutting down GroupsMessagingModule module.");
169 166
170 foreach (Scene scene in m_sceneList) 167 foreach (Scene scene in m_sceneList)
171 { 168 {
@@ -186,7 +183,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
186 183
187 public string Name 184 public string Name
188 { 185 {
189 get { return "XmlRpcGroupsMessaging"; } 186 get { return "GroupsMessagingModule"; }
190 } 187 }
191 188
192 #endregion 189 #endregion
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 3fd2a85..5ec8de8 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -57,14 +57,19 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
57 /// ; To use this module, you must specify the following in your OpenSim.ini 57 /// ; To use this module, you must specify the following in your OpenSim.ini
58 /// [GROUPS] 58 /// [GROUPS]
59 /// Enabled = true 59 /// Enabled = true
60 /// Module = XmlRpcGroups 60 ///
61 /// XmlRpcServiceURL = http://osflotsam.org/xmlrpc.php 61 /// GroupsModule = GroupsModule
62 /// XmlRpcMessagingEnabled = true 62 /// NoticesEnabled = true
63 /// XmlRpcNoticesEnabled = true 63 /// DebugEnabled = true
64 /// XmlRpcDebugEnabled = true 64 ///
65 /// XmlRpcServiceReadKey = 1234 65 /// GroupsServicesConnectorModule = XmlRpcGroupsServicesConnector
66 /// XmlRpcServiceURL = http://osflotsam.org/xmlrpc.php
67 /// XmlRpcServiceReadKey = 1234
66 /// XmlRpcServiceWriteKey = 1234 68 /// XmlRpcServiceWriteKey = 1234
67 /// 69 ///
70 /// GroupsMessagingModule = GroupsMessagingModule
71 /// GroupsMessagingEnabled = true
72 ///
68 /// ; Disables HTTP Keep-Alive for Groups Module HTTP Requests, work around for 73 /// ; Disables HTTP Keep-Alive for Groups Module HTTP Requests, work around for
69 /// ; a problem discovered on some Windows based region servers. Only disable 74 /// ; a problem discovered on some Windows based region servers. Only disable
70 /// ; if you see a large number (dozens) of the following Exceptions: 75 /// ; if you see a large number (dozens) of the following Exceptions:
@@ -116,7 +121,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
116 return; 121 return;
117 } 122 }
118 123
119 if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups") 124 if (groupsConfig.GetString("Module", "Default") != Name)
120 { 125 {
121 m_groupsEnabled = false; 126 m_groupsEnabled = false;
122 127
@@ -125,8 +130,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
125 130
126 m_log.InfoFormat("[GROUPS]: Initializing {0}", this.Name); 131 m_log.InfoFormat("[GROUPS]: Initializing {0}", this.Name);
127 132
128 m_groupNoticesEnabled = groupsConfig.GetBoolean("XmlRpcNoticesEnabled", true); 133 m_groupNoticesEnabled = groupsConfig.GetBoolean("NoticesEnabled", true);
129 m_debugEnabled = groupsConfig.GetBoolean("XmlRpcDebugEnabled", true); 134 m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true);
130 135
131 m_clientRequestIDFlushTimer.Interval = m_clientRequestIDFlushTimeOut; 136 m_clientRequestIDFlushTimer.Interval = m_clientRequestIDFlushTimeOut;
132 m_clientRequestIDFlushTimer.Elapsed += FlushClientRequestIDInfoCache; 137 m_clientRequestIDFlushTimer.Elapsed += FlushClientRequestIDInfoCache;
@@ -224,7 +229,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
224 if (!m_groupsEnabled) 229 if (!m_groupsEnabled)
225 return; 230 return;
226 231
227 if (m_debugEnabled) m_log.Debug("[GROUPS]: Shutting down XmlRpcGroups module."); 232 if (m_debugEnabled) m_log.Debug("[GROUPS]: Shutting down Groups module.");
228 233
229 m_clientRequestIDFlushTimer.Stop(); 234 m_clientRequestIDFlushTimer.Stop();
230 } 235 }
@@ -236,7 +241,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
236 241
237 public string Name 242 public string Name
238 { 243 {
239 get { return "XmlRpcGroupsModule"; } 244 get { return "GroupsModule"; }
240 } 245 }
241 246
242 #endregion 247 #endregion
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index 80adb9e..d77fe5b 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
96 // if groups aren't enabled, we're not needed. 96 // if groups aren't enabled, we're not needed.
97 // if we're not specified as the connector to use, then we're not wanted 97 // if we're not specified as the connector to use, then we're not wanted
98 if ( (groupsConfig.GetBoolean("Enabled", false) == false) 98 if ( (groupsConfig.GetBoolean("Enabled", false) == false)
99 || (groupsConfig.GetString("GroupsServicesConnectorModule", "Default") != Name)) 99 || (groupsConfig.GetString("ServicesConnectorModule", "Default") != Name))
100 { 100 {
101 m_connectorEnabled = false; 101 m_connectorEnabled = false;
102 return; 102 return;
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 6ae6a95..643b0af 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1271,21 +1271,28 @@
1271 ; The PHP code for the server is available from the Flotsam project for you to deploy 1271 ; The PHP code for the server is available from the Flotsam project for you to deploy
1272 ; to your own server. The Flotsam project is located at http://code.google.com/p/flotsam/ 1272 ; to your own server. The Flotsam project is located at http://code.google.com/p/flotsam/
1273 ; 1273 ;
1274 ;Module = XmlRpcGroups 1274 ;Module = GroupsModule
1275 1275
1276 ;XmlRpcServiceURL = http://yourxmlrpcserver.com/xmlrpc.php 1276 ; Enable Group Notices
1277 ;XmlRpcServiceReadKey = 1234 1277 ;NoticesEnabled = true
1278 ;XmlRpcServiceWriteKey = 1234 1278
1279 1279 ; This makes the Groups modules very chatty on the console.
1280 ;XmlRpcMessagingEnabled = true 1280 ;DebugEnabled = true
1281 ;XmlRpcNoticesEnabled = true 1281
1282 1282 ; Specify which messaging module to use for groups messaging and if it's enabled
1283 ; This makes the XmlRpcGroups modules very chatty on the console. 1283 ;MessagingModule = GroupsMessagingModule
1284 ;XmlRpcDebugEnabled = true 1284 ;MessagingEnabled = true
1285 1285
1286 ; Disables HTTP Keep-Alive for Groups Module HTTP Requests, work around for 1286 ; Service connector to Groups Service [Select One]
1287 ; a problem discovered on some Windows based region servers. Only disable 1287 ; XmlRpc Service Connector to the Flotsam XmlRpc Groups Service Implementation
1288 ; if you see a large number (dozens) of the following Exceptions: 1288 ;ServicesConnectorModule = XmlRpcGroupsServicesConnector
1289 ;XmlRpcServiceURL = http://yourxmlrpcserver.com/xmlrpc.php
1290 ;XmlRpcServiceReadKey = 1234
1291 ;XmlRpcServiceWriteKey = 1234
1292
1293 ; Disables HTTP Keep-Alive for XmlRpcGroupsServicesConnector HTTP Requests,
1294 ; this is a work around fora problem discovered on some Windows based region servers.
1295 ; Only disable keep alive if you see a large number (dozens) of the following Exceptions:
1289 ; System.Net.WebException: The request was aborted: The request was canceled. 1296 ; System.Net.WebException: The request was aborted: The request was canceled.
1290 ; 1297 ;
1291 ; XmlRpcDisableKeepAlive = false 1298 ; XmlRpcDisableKeepAlive = false