aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/MainServer.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-25 20:24:21 +0100
committerJustin Clark-Casey (justincc)2011-10-25 20:24:21 +0100
commit8a0a78cbccce796addacab7ed1609279b802a9b3 (patch)
tree31ddb6da7bca6eeb61cb7747532dcf77828cfbe3 /OpenSim/Framework/MainServer.cs
parentDrop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer() (diff)
downloadopensim-SC_OLD-8a0a78cbccce796addacab7ed1609279b802a9b3.zip
opensim-SC_OLD-8a0a78cbccce796addacab7ed1609279b802a9b3.tar.gz
opensim-SC_OLD-8a0a78cbccce796addacab7ed1609279b802a9b3.tar.bz2
opensim-SC_OLD-8a0a78cbccce796addacab7ed1609279b802a9b3.tar.xz
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
Diffstat (limited to 'OpenSim/Framework/MainServer.cs')
-rw-r--r--OpenSim/Framework/MainServer.cs81
1 files changed, 0 insertions, 81 deletions
diff --git a/OpenSim/Framework/MainServer.cs b/OpenSim/Framework/MainServer.cs
deleted file mode 100644
index a3e0a26..0000000
--- a/OpenSim/Framework/MainServer.cs
+++ /dev/null
@@ -1,81 +0,0 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System.Collections.Generic;
29using System.Reflection;
30using System.Net;
31using log4net;
32using OpenSim.Framework.Servers.HttpServer;
33
34namespace OpenSim.Framework
35{
36 public class MainServer
37 {
38 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39
40 private static BaseHttpServer instance = null;
41 private static Dictionary<uint, BaseHttpServer> m_Servers =
42 new Dictionary<uint, BaseHttpServer>();
43
44 public static BaseHttpServer Instance
45 {
46 get { return instance; }
47 set { instance = value; }
48 }
49
50 public static IHttpServer GetHttpServer(uint port)
51 {
52 return GetHttpServer(port,null);
53 }
54
55 public static void AddHttpServer(BaseHttpServer server)
56 {
57 m_Servers.Add(server.Port, server);
58 }
59
60 public static IHttpServer GetHttpServer(uint port, IPAddress ipaddr)
61 {
62 if (port == 0)
63 return Instance;
64 if (instance != null && port == Instance.Port)
65 return Instance;
66
67 if (m_Servers.ContainsKey(port))
68 return m_Servers[port];
69
70 m_Servers[port] = new BaseHttpServer(port);
71
72 if (ipaddr != null)
73 m_Servers[port].ListenIPAddress = ipaddr;
74
75 m_log.InfoFormat("[MAIN HTTP SERVER]: Starting main http server on port {0}", port);
76 m_Servers[port].Start();
77
78 return m_Servers[port];
79 }
80 }
81}