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

Convert LoadBalancer and RegionProxy plugins to use XML manifests. Fixes 

"Plugin Error: Node 'Type' not allowed" messages during region server startup.
0.6.0-stable
Mike Mazur 2008-08-19 09:24:12 +00:00
parent 29530f3029
commit 894f3045ed
5 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs vendored
View File

@ -45,14 +45,8 @@ using OpenSim.Region.Environment.Scenes;
// TODO: remove LindenUDP dependency // TODO: remove LindenUDP dependency
[assembly : Addin]
[assembly : AddinDependency("OpenSim", "0.5")]
[assembly : AddinDependency("RegionProxy", "0.1")]
namespace OpenSim.ApplicationPlugins.LoadBalancer namespace OpenSim.ApplicationPlugins.LoadBalancer
{ {
[Extension("/OpenSim/Startup")]
[ExtensionNode ("Plugin")]
public class LoadBalancerPlugin : IApplicationPlugin public class LoadBalancerPlugin : IApplicationPlugin
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@ -76,14 +70,14 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
#region IApplicationPlugin Members #region IApplicationPlugin Members
// TODO: required by IPlugin, but likely not at all right // TODO: required by IPlugin, but likely not at all right
string m_name = "LoadBalancerPlugin"; string m_name = "LoadBalancer";
string m_version = "0.0"; string m_version = "0.1";
public string Version { get { return m_version; } } public string Version { get { return m_version; } }
public string Name { get { return m_name; } } public string Name { get { return m_name; } }
public void Initialise() public void Initialise()
{ {
m_log.Info("[BALANCER]: " + Name + " cannot be default-initialized!"); m_log.Info("[BALANCER]: " + Name + " cannot be default-initialized!");
throw new PluginNotInitialisedException (Name); throw new PluginNotInitialisedException (Name);
} }

12
ThirdParty/3Di/LoadBalancer/Resources/LoadBalancer.addin.xml vendored Normal file
View File

@ -0,0 +1,12 @@
<Addin id="LoadBalancer" version="0.1">
<Runtime>
<Import assembly="OpenSim.ApplicationPlugins.LoadBalancer.dll" />
</Runtime>
<Dependencies>
<Addin id="OpenSim" version="0.5" />
<Addin id="RegionProxy" version="0.1" />
</Dependencies>
<Extension path="/OpenSim/Startup">
<Plugin id="LoadBalancer" type="OpenSim.ApplicationPlugins.LoadBalancer.LoadBalancerPlugin" />
</Extension>
</Addin>

10
ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs vendored
View File

@ -37,9 +37,6 @@ using Nwc.XmlRpc;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
[assembly : Addin("RegionProxy", "0.1")]
[assembly : AddinDependency("OpenSim", "0.5")]
namespace OpenSim.ApplicationPlugins.RegionProxy namespace OpenSim.ApplicationPlugins.RegionProxy
{ {
/* This module has an interface to OpenSim clients that is constant, and is responsible for relaying /* This module has an interface to OpenSim clients that is constant, and is responsible for relaying
@ -60,7 +57,6 @@ namespace OpenSim.ApplicationPlugins.RegionProxy
* - UnblockClientMessages * - UnblockClientMessages
*/ */
[Extension("/OpenSim/Startup")]
public class RegionProxyPlugin : IApplicationPlugin public class RegionProxyPlugin : IApplicationPlugin
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@ -69,8 +65,8 @@ namespace OpenSim.ApplicationPlugins.RegionProxy
#region IApplicationPlugin Members #region IApplicationPlugin Members
// TODO: required by IPlugin, but likely not at all right // TODO: required by IPlugin, but likely not at all right
string m_name = "RegionProxyPlugin"; string m_name = "RegionProxy";
string m_version = "0.0"; string m_version = "0.1";
public string Version { get { return m_version; } } public string Version { get { return m_version; } }
public string Name { get { return m_name; } } public string Name { get { return m_name; } }
@ -83,7 +79,7 @@ namespace OpenSim.ApplicationPlugins.RegionProxy
public void Initialise(OpenSimBase openSim) public void Initialise(OpenSimBase openSim)
{ {
m_log.Info("Starting proxy"); m_log.Info("[PROXY] Starting proxy");
string proxyURL = openSim.ConfigSource.Source.Configs["Network"].GetString("proxy_url", ""); string proxyURL = openSim.ConfigSource.Source.Configs["Network"].GetString("proxy_url", "");
if (proxyURL.Length == 0) return; if (proxyURL.Length == 0) return;

11
ThirdParty/3Di/RegionProxy/Resources/RegionProxy.addin.xml vendored Normal file
View File

@ -0,0 +1,11 @@
<Addin id="RegionProxy" version="0.1">
<Runtime>
<Import assembly="OpenSim.ApplicationPlugins.RegionProxy.dll" />
</Runtime>
<Dependencies>
<Addin id="OpenSim" version="0.5" />
</Dependencies>
<Extension path="/OpenSim/Startup">
<Plugin id="RegionProxy" type="OpenSim.ApplicationPlugins.RegionProxy.RegionProxyPlugin" />
</Extension>
</Addin>

2
prebuild.xml
View File

@ -2122,6 +2122,7 @@
<Reference name="OpenSim.Region.ClientStack"/> <Reference name="OpenSim.Region.ClientStack"/>
<Files> <Files>
<Match pattern="*.cs" recurse="true"/> <Match pattern="*.cs" recurse="true"/>
<Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
</Files> </Files>
</Project> </Project>
@ -2156,6 +2157,7 @@
<Reference name="libsecondlife.dll"/> <Reference name="libsecondlife.dll"/>
<Files> <Files>
<Match pattern="*.cs" recurse="true"/> <Match pattern="*.cs" recurse="true"/>
<Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
</Files> </Files>
</Project> </Project>