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

Continue with renaming of Groups module components

arthursv
Michael Cortez 2009-08-05 14:56:48 -07:00
parent 6c65b990a2
commit c73a6ab7e0
4 changed files with 47 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
View File

@ -59,7 +59,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
private IGroupsModule m_groupsModule = null; private IGroupsModule m_groupsModule = null;
// TODO: Move this off to the xmlrpc server // TODO: Move this off to the Groups Server
public Dictionary<Guid, List<Guid>> m_agentsInGroupSession = new Dictionary<Guid, List<Guid>>(); public Dictionary<Guid, List<Guid>> m_agentsInGroupSession = new Dictionary<Guid, List<Guid>>();
public Dictionary<Guid, List<Guid>> m_agentsDroppedSession = new Dictionary<Guid, List<Guid>>(); public Dictionary<Guid, List<Guid>> m_agentsDroppedSession = new Dictionary<Guid, List<Guid>>();
@ -81,31 +81,28 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
} }
else else
{ {
if (!groupsConfig.GetBoolean("Enabled", false)) // if groups aren't enabled, we're not needed.
{ // if we're not specified as the connector to use, then we're not wanted
return; if ((groupsConfig.GetBoolean("Enabled", false) == false)
} || (groupsConfig.GetString("MessagingModule", "Default") != Name))
if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups")
{ {
m_groupMessagingEnabled = false; m_groupMessagingEnabled = false;
return; return;
} }
m_groupMessagingEnabled = groupsConfig.GetBoolean("XmlRpcMessagingEnabled", true); m_groupMessagingEnabled = groupsConfig.GetBoolean("MessagingEnabled", true);
if (!m_groupMessagingEnabled) if (!m_groupMessagingEnabled)
{ {
return; return;
} }
m_log.Info("[GROUPS-MESSAGING]: Initializing XmlRpcGroupsMessaging"); m_log.Info("[GROUPS-MESSAGING]: Initializing GroupsMessagingModule");
m_debugEnabled = groupsConfig.GetBoolean("XmlRpcDebugEnabled", true); m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true);
} }
m_log.Info("[GROUPS-MESSAGING]: XmlRpcGroupsMessaging starting up"); m_log.Info("[GROUPS-MESSAGING]: GroupsMessagingModule starting up");
} }
@ -125,7 +122,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
// No groups module, no groups messaging // No groups module, no groups messaging
if (m_groupsModule == null) if (m_groupsModule == null)
{ {
m_log.Error("[GROUPS-MESSAGING]: Could not get IGroupsModule, XmlRpcGroupsMessaging is now disabled."); m_log.Error("[GROUPS-MESSAGING]: Could not get IGroupsModule, GroupsMessagingModule is now disabled.");
Close(); Close();
m_groupMessagingEnabled = false; m_groupMessagingEnabled = false;
return; return;
@ -165,7 +162,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
if (!m_groupMessagingEnabled) if (!m_groupMessagingEnabled)
return; return;
if (m_debugEnabled) m_log.Debug("[GROUPS-MESSAGING]: Shutting down XmlRpcGroupsMessaging module."); if (m_debugEnabled) m_log.Debug("[GROUPS-MESSAGING]: Shutting down GroupsMessagingModule module.");
foreach (Scene scene in m_sceneList) foreach (Scene scene in m_sceneList)
{ {
@ -186,7 +183,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
public string Name public string Name
{ {
get { return "XmlRpcGroupsMessaging"; } get { return "GroupsMessagingModule"; }
} }
#endregion #endregion

27
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
View File

@ -57,14 +57,19 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
/// ; To use this module, you must specify the following in your OpenSim.ini /// ; To use this module, you must specify the following in your OpenSim.ini
/// [GROUPS] /// [GROUPS]
/// Enabled = true /// Enabled = true
/// Module = XmlRpcGroups ///
/// XmlRpcServiceURL = http://osflotsam.org/xmlrpc.php /// GroupsModule = GroupsModule
/// XmlRpcMessagingEnabled = true /// NoticesEnabled = true
/// XmlRpcNoticesEnabled = true /// DebugEnabled = true
/// XmlRpcDebugEnabled = true ///
/// XmlRpcServiceReadKey = 1234 /// GroupsServicesConnectorModule = XmlRpcGroupsServicesConnector
/// XmlRpcServiceURL = http://osflotsam.org/xmlrpc.php
/// XmlRpcServiceReadKey = 1234
/// XmlRpcServiceWriteKey = 1234 /// XmlRpcServiceWriteKey = 1234
/// ///
/// GroupsMessagingModule = GroupsMessagingModule
/// GroupsMessagingEnabled = true
///
/// ; Disables HTTP Keep-Alive for Groups Module HTTP Requests, work around for /// ; Disables HTTP Keep-Alive for Groups Module HTTP Requests, work around for
/// ; a problem discovered on some Windows based region servers. Only disable /// ; a problem discovered on some Windows based region servers. Only disable
/// ; if you see a large number (dozens) of the following Exceptions: /// ; if you see a large number (dozens) of the following Exceptions:
@ -116,7 +121,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
return; return;
} }
if (groupsConfig.GetString("Module", "Default") != "XmlRpcGroups") if (groupsConfig.GetString("Module", "Default") != Name)
{ {
m_groupsEnabled = false; m_groupsEnabled = false;
@ -125,8 +130,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
m_log.InfoFormat("[GROUPS]: Initializing {0}", this.Name); m_log.InfoFormat("[GROUPS]: Initializing {0}", this.Name);
m_groupNoticesEnabled = groupsConfig.GetBoolean("XmlRpcNoticesEnabled", true); m_groupNoticesEnabled = groupsConfig.GetBoolean("NoticesEnabled", true);
m_debugEnabled = groupsConfig.GetBoolean("XmlRpcDebugEnabled", true); m_debugEnabled = groupsConfig.GetBoolean("DebugEnabled", true);
m_clientRequestIDFlushTimer.Interval = m_clientRequestIDFlushTimeOut; m_clientRequestIDFlushTimer.Interval = m_clientRequestIDFlushTimeOut;
m_clientRequestIDFlushTimer.Elapsed += FlushClientRequestIDInfoCache; m_clientRequestIDFlushTimer.Elapsed += FlushClientRequestIDInfoCache;
@ -224,7 +229,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
if (!m_groupsEnabled) if (!m_groupsEnabled)
return; return;
if (m_debugEnabled) m_log.Debug("[GROUPS]: Shutting down XmlRpcGroups module."); if (m_debugEnabled) m_log.Debug("[GROUPS]: Shutting down Groups module.");
m_clientRequestIDFlushTimer.Stop(); m_clientRequestIDFlushTimer.Stop();
} }
@ -236,7 +241,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
public string Name public string Name
{ {
get { return "XmlRpcGroupsModule"; } get { return "GroupsModule"; }
} }
#endregion #endregion

2
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
View File

@ -96,7 +96,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
// if groups aren't enabled, we're not needed. // if groups aren't enabled, we're not needed.
// if we're not specified as the connector to use, then we're not wanted // if we're not specified as the connector to use, then we're not wanted
if ( (groupsConfig.GetBoolean("Enabled", false) == false) if ( (groupsConfig.GetBoolean("Enabled", false) == false)
|| (groupsConfig.GetString("GroupsServicesConnectorModule", "Default") != Name)) || (groupsConfig.GetString("ServicesConnectorModule", "Default") != Name))
{ {
m_connectorEnabled = false; m_connectorEnabled = false;
return; return;

29
bin/OpenSim.ini.example
View File

@ -1271,21 +1271,28 @@
; The PHP code for the server is available from the Flotsam project for you to deploy ; The PHP code for the server is available from the Flotsam project for you to deploy
; to your own server. The Flotsam project is located at http://code.google.com/p/flotsam/ ; to your own server. The Flotsam project is located at http://code.google.com/p/flotsam/
; ;
;Module = XmlRpcGroups ;Module = GroupsModule
;XmlRpcServiceURL = http://yourxmlrpcserver.com/xmlrpc.php ; Enable Group Notices
;XmlRpcServiceReadKey = 1234 ;NoticesEnabled = true
;XmlRpcServiceWriteKey = 1234
;XmlRpcMessagingEnabled = true ; This makes the Groups modules very chatty on the console.
;XmlRpcNoticesEnabled = true ;DebugEnabled = true
; This makes the XmlRpcGroups modules very chatty on the console. ; Specify which messaging module to use for groups messaging and if it's enabled
;XmlRpcDebugEnabled = true ;MessagingModule = GroupsMessagingModule
;MessagingEnabled = true
; Disables HTTP Keep-Alive for Groups Module HTTP Requests, work around for ; Service connector to Groups Service [Select One]
; a problem discovered on some Windows based region servers. Only disable ; XmlRpc Service Connector to the Flotsam XmlRpc Groups Service Implementation
; if you see a large number (dozens) of the following Exceptions: ;ServicesConnectorModule = XmlRpcGroupsServicesConnector
;XmlRpcServiceURL = http://yourxmlrpcserver.com/xmlrpc.php
;XmlRpcServiceReadKey = 1234
;XmlRpcServiceWriteKey = 1234
; Disables HTTP Keep-Alive for XmlRpcGroupsServicesConnector HTTP Requests,
; this is a work around fora problem discovered on some Windows based region servers.
; Only disable keep alive if you see a large number (dozens) of the following Exceptions:
; System.Net.WebException: The request was aborted: The request was canceled. ; System.Net.WebException: The request was aborted: The request was canceled.
; ;
; XmlRpcDisableKeepAlive = false ; XmlRpcDisableKeepAlive = false