From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 21:24:15 +1000 Subject: Dump OpenSim 0.9.0.1 into it's own branch. --- OpenSim/Server/ServerMain.cs | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'OpenSim/Server/ServerMain.cs') diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs index 65e9287..69d0b74 100644 --- a/OpenSim/Server/ServerMain.cs +++ b/OpenSim/Server/ServerMain.cs @@ -29,7 +29,9 @@ using Nini.Config; using log4net; using System.Reflection; using System; +using System.Net; using System.Collections.Generic; +using OpenSim.Framework; using OpenSim.Framework.Servers; using OpenSim.Framework.Servers.HttpServer; using OpenSim.Server.Base; @@ -53,8 +55,14 @@ namespace OpenSim.Server public static int Main(string[] args) { + ServicePointManager.DefaultConnectionLimit = 64; + ServicePointManager.Expect100Continue = false; + ServicePointManager.UseNagleAlgorithm = false; + + try { ServicePointManager.DnsRefreshTimeout = 300000; } catch { } + m_Server = new HttpServerBase("R.O.B.U.S.T.", args); - + string registryLocation; IConfig serverConfig = m_Server.Config.Configs["Startup"]; @@ -65,7 +73,7 @@ namespace OpenSim.Server } string connList = serverConfig.GetString("ServiceConnectors", String.Empty); - + registryLocation = serverConfig.GetString("RegistryLocation","."); IConfig servicesConfig = m_Server.Config.Configs["ServiceList"]; @@ -153,6 +161,11 @@ namespace OpenSim.Server int res = m_Server.Run(); + if(m_Server != null) + m_Server.Shutdown(); + + Util.StopThreadPool(); + Environment.Exit(res); return 0; -- cgit v1.1 From eda035228d8206fd593cfd0ab98cf3c84229a365 Mon Sep 17 00:00:00 2001 From: onefang Date: Mon, 5 Aug 2019 04:18:18 +1000 Subject: ROBUST now reports INITIALIZATION COMPLETE FOR ROBUST. --- OpenSim/Server/ServerMain.cs | 2 ++ 1 file changed, 2 insertions(+) (limited to 'OpenSim/Server/ServerMain.cs') diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs index 69d0b74..30e9297 100644 --- a/OpenSim/Server/ServerMain.cs +++ b/OpenSim/Server/ServerMain.cs @@ -159,6 +159,8 @@ namespace OpenSim.Server loader = new PluginLoader(m_Server.Config, registryLocation); + m_log.InfoFormat("[SERVER]: INITIALIZATION COMPLETE FOR ROBUST"); + int res = m_Server.Run(); if(m_Server != null) -- cgit v1.1