diff options
Diffstat (limited to 'OpenSim/Server/ServerMain.cs')
-rw-r--r-- | OpenSim/Server/ServerMain.cs | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs index 65e9287..30e9297 100644 --- a/OpenSim/Server/ServerMain.cs +++ b/OpenSim/Server/ServerMain.cs | |||
@@ -29,7 +29,9 @@ using Nini.Config; | |||
29 | using log4net; | 29 | using log4net; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System; | 31 | using System; |
32 | using System.Net; | ||
32 | using System.Collections.Generic; | 33 | using System.Collections.Generic; |
34 | using OpenSim.Framework; | ||
33 | using OpenSim.Framework.Servers; | 35 | using OpenSim.Framework.Servers; |
34 | using OpenSim.Framework.Servers.HttpServer; | 36 | using OpenSim.Framework.Servers.HttpServer; |
35 | using OpenSim.Server.Base; | 37 | using OpenSim.Server.Base; |
@@ -53,8 +55,14 @@ namespace OpenSim.Server | |||
53 | 55 | ||
54 | public static int Main(string[] args) | 56 | public static int Main(string[] args) |
55 | { | 57 | { |
58 | ServicePointManager.DefaultConnectionLimit = 64; | ||
59 | ServicePointManager.Expect100Continue = false; | ||
60 | ServicePointManager.UseNagleAlgorithm = false; | ||
61 | |||
62 | try { ServicePointManager.DnsRefreshTimeout = 300000; } catch { } | ||
63 | |||
56 | m_Server = new HttpServerBase("R.O.B.U.S.T.", args); | 64 | m_Server = new HttpServerBase("R.O.B.U.S.T.", args); |
57 | 65 | ||
58 | string registryLocation; | 66 | string registryLocation; |
59 | 67 | ||
60 | IConfig serverConfig = m_Server.Config.Configs["Startup"]; | 68 | IConfig serverConfig = m_Server.Config.Configs["Startup"]; |
@@ -65,7 +73,7 @@ namespace OpenSim.Server | |||
65 | } | 73 | } |
66 | 74 | ||
67 | string connList = serverConfig.GetString("ServiceConnectors", String.Empty); | 75 | string connList = serverConfig.GetString("ServiceConnectors", String.Empty); |
68 | 76 | ||
69 | registryLocation = serverConfig.GetString("RegistryLocation","."); | 77 | registryLocation = serverConfig.GetString("RegistryLocation","."); |
70 | 78 | ||
71 | IConfig servicesConfig = m_Server.Config.Configs["ServiceList"]; | 79 | IConfig servicesConfig = m_Server.Config.Configs["ServiceList"]; |
@@ -151,8 +159,15 @@ namespace OpenSim.Server | |||
151 | 159 | ||
152 | loader = new PluginLoader(m_Server.Config, registryLocation); | 160 | loader = new PluginLoader(m_Server.Config, registryLocation); |
153 | 161 | ||
162 | m_log.InfoFormat("[SERVER]: INITIALIZATION COMPLETE FOR ROBUST"); | ||
163 | |||
154 | int res = m_Server.Run(); | 164 | int res = m_Server.Run(); |
155 | 165 | ||
166 | if(m_Server != null) | ||
167 | m_Server.Shutdown(); | ||
168 | |||
169 | Util.StopThreadPool(); | ||
170 | |||
156 | Environment.Exit(res); | 171 | Environment.Exit(res); |
157 | 172 | ||
158 | return 0; | 173 | return 0; |