From f7dbfe63e55ca875c1079084c4ca153f9a815327 Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Mon, 18 May 2009 21:04:25 +0000 Subject: This commit changes the way the new server works. There is no longer a server exe for each function, rather each function is a connector and the server ini loads them. If you like your multiple processes, use -inifile with the server. Otherwise, you get one server process that serves all configured funcions, see example .ini. The new exe is OpenSim.Server.exe. Clean your bin, loads of names have changed! --- OpenSim/Server/AssetServer/AssetServerMain.cs | 50 ------------ .../Server/Handlers/Asset/AssetServerConnector.cs | 6 +- OpenSim/Server/ServerMain.cs | 94 ++++++++++++++++++++++ bin/OpenSim.Server.exe.config | 33 ++++++++ bin/OpenSim.Server.ini.example | 19 +++++ bin/OpenSim.Servers.AssetServer.exe.config | 33 -------- bin/OpenSim.Servers.AssetServer.ini.example | 16 ---- prebuild.xml | 8 +- 8 files changed, 154 insertions(+), 105 deletions(-) delete mode 100644 OpenSim/Server/AssetServer/AssetServerMain.cs create mode 100644 OpenSim/Server/ServerMain.cs create mode 100644 bin/OpenSim.Server.exe.config create mode 100644 bin/OpenSim.Server.ini.example delete mode 100644 bin/OpenSim.Servers.AssetServer.exe.config delete mode 100644 bin/OpenSim.Servers.AssetServer.ini.example diff --git a/OpenSim/Server/AssetServer/AssetServerMain.cs b/OpenSim/Server/AssetServer/AssetServerMain.cs deleted file mode 100644 index b08c8cf..0000000 --- a/OpenSim/Server/AssetServer/AssetServerMain.cs +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSim Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using System; -using OpenSim.Server.Base; -using OpenSim.Server.Handlers.Asset; - -namespace OpenSim.Server.AssetServer -{ - public class AssetServer - { - protected static HttpServerBase m_Server = null; - - protected static AssetServiceConnector m_AssetServiceConnector; - - static int Main(string[] args) - { - m_Server = new HttpServerBase("Asset", args); - - m_AssetServiceConnector = new AssetServiceConnector(m_Server.Config, - m_Server.HttpServer); - - return m_Server.Run(); - } - } -} diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs index 64014f5..686e6dd 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs @@ -30,14 +30,16 @@ using Nini.Config; using OpenSim.Server.Base; using OpenSim.Services.Interfaces; using OpenSim.Framework.Servers.HttpServer; +using OpenSim.Server.Handlers.Base; namespace OpenSim.Server.Handlers.Asset { - public class AssetServiceConnector + public class AssetServiceConnector : ServiceConnector { private IAssetService m_AssetService; - public AssetServiceConnector(IConfigSource config, IHttpServer server) + public AssetServiceConnector(IConfigSource config, IHttpServer server) : + base(config, server) { IConfig serverConfig = config.Configs["AssetService"]; if (serverConfig == null) diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs new file mode 100644 index 0000000..352ae98 --- /dev/null +++ b/OpenSim/Server/ServerMain.cs @@ -0,0 +1,94 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSim Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using Nini.Config; +using log4net; +using System.Reflection; +using System; +using System.Collections.Generic; +using OpenSim.Server.Base; +using OpenSim.Server.Handlers.Base; +using OpenSim.Server.Handlers.Asset; + +namespace OpenSim.Server +{ + public class OpenSimServer + { + private static readonly ILog m_log = + LogManager.GetLogger( + MethodBase.GetCurrentMethod().DeclaringType); + + protected static HttpServerBase m_Server = null; + + protected static List m_ServiceConnectors = + new List(); + + static int Main(string[] args) + { + m_Server = new HttpServerBase("Asset", args); + + IConfig serverConfig = m_Server.Config.Configs["Startup"]; + if (serverConfig == null) + { + System.Console.WriteLine("Startup config section missing in .ini file"); + throw new Exception("Configuration error"); + } + + string connList = serverConfig.GetString("ServiceConnectors", String.Empty); + string[] conns = connList.Split(new char[] {',', ' '}); + + foreach (string conn in conns) + { + if (conn == String.Empty) + continue; + + string[] parts = conn.Split(new char[] {':'}); + string friendlyName = parts[0]; + if (parts.Length > 1) + friendlyName = parts[1]; + + m_log.InfoFormat("[SERVER]: Loading {0}", friendlyName); + + Object[] modargs = new Object[] { m_Server.Config, m_Server.HttpServer }; + IServiceConnector connector = + ServerUtils.LoadPlugin(conn, + modargs); + + if (connector != null) + { + m_ServiceConnectors.Add(connector); + m_log.InfoFormat("[SERVER]: {0} loaded successfully", friendlyName); + } + else + { + m_log.InfoFormat("[SERVER]: Failed to load {0}", conn); + } + } + return m_Server.Run(); + } + } +} diff --git a/bin/OpenSim.Server.exe.config b/bin/OpenSim.Server.exe.config new file mode 100644 index 0000000..c2d93c0 --- /dev/null +++ b/bin/OpenSim.Server.exe.config @@ -0,0 +1,33 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example new file mode 100644 index 0000000..b2e0f96 --- /dev/null +++ b/bin/OpenSim.Server.ini.example @@ -0,0 +1,19 @@ +[Startup] +; These are also available as command line options + +; console = "local" ; Use "basic" to use this on a pipe +; inifile = "OpenSim.Servers.AssetServer.ini" +; logfile = "AssetServer.log" ; Also read from application config file + +; Connectors, comma separated +ServiceConnectors = "OpenSim.Server.Handlers.dll:AssetServiceConnector" + +[Network] +port = 8003 + +[AssetService] +LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" +StorageProvider = "OpenSim.Data.MySQL.dll" +ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim;" +DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" +AssetLoaderArgs = "assets/AssetSets.xml" diff --git a/bin/OpenSim.Servers.AssetServer.exe.config b/bin/OpenSim.Servers.AssetServer.exe.config deleted file mode 100644 index c2d93c0..0000000 --- a/bin/OpenSim.Servers.AssetServer.exe.config +++ /dev/null @@ -1,33 +0,0 @@ - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bin/OpenSim.Servers.AssetServer.ini.example b/bin/OpenSim.Servers.AssetServer.ini.example deleted file mode 100644 index 656ded0..0000000 --- a/bin/OpenSim.Servers.AssetServer.ini.example +++ /dev/null @@ -1,16 +0,0 @@ -[Startup] -; These are also available as command line options - -; console = "local" ; Use "basic" to use this on a pipe -; inifile = "OpenSim.Servers.AssetServer.ini" -; logfile = "AssetServer.log" ; Also read from application config file - -[Network] -port = 8003 - -[AssetService] -LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" -StorageProvider = "OpenSim.Data.MySQL.dll" -ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim;" -DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" -AssetLoaderArgs = "assets/AssetSets.xml" diff --git a/prebuild.xml b/prebuild.xml index 1c4d41e..697c266 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -1418,19 +1418,19 @@ - + - ../../../bin/ + ../../bin/ - ../../../bin/ + ../../bin/ - ../../../bin/ + ../../bin/ -- cgit v1.1