diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/MainServer.cs | 8 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Framework/MainServer.cs b/OpenSim/Framework/MainServer.cs index 84cc05e..1f5f208 100644 --- a/OpenSim/Framework/MainServer.cs +++ b/OpenSim/Framework/MainServer.cs | |||
@@ -25,13 +25,17 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using OpenSim.Framework.Servers.HttpServer; | ||
29 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Reflection; | ||
30 | using log4net; | ||
31 | using OpenSim.Framework.Servers.HttpServer; | ||
30 | 32 | ||
31 | namespace OpenSim.Framework | 33 | namespace OpenSim.Framework |
32 | { | 34 | { |
33 | public class MainServer | 35 | public class MainServer |
34 | { | 36 | { |
37 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
38 | |||
35 | private static BaseHttpServer instance = null; | 39 | private static BaseHttpServer instance = null; |
36 | private static Dictionary<uint, BaseHttpServer> m_Servers = | 40 | private static Dictionary<uint, BaseHttpServer> m_Servers = |
37 | new Dictionary<uint, BaseHttpServer>(); | 41 | new Dictionary<uint, BaseHttpServer>(); |
@@ -53,6 +57,8 @@ namespace OpenSim.Framework | |||
53 | return m_Servers[port]; | 57 | return m_Servers[port]; |
54 | 58 | ||
55 | m_Servers[port] = new BaseHttpServer(port); | 59 | m_Servers[port] = new BaseHttpServer(port); |
60 | |||
61 | m_log.InfoFormat("[MAIN HTTP SERVER]: Starting main http server on port {0}", port); | ||
56 | m_Servers[port].Start(); | 62 | m_Servers[port].Start(); |
57 | 63 | ||
58 | return m_Servers[port]; | 64 | return m_Servers[port]; |
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 43a6757..a6e00c2 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -1580,7 +1580,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1580 | 1580 | ||
1581 | public void Start() | 1581 | public void Start() |
1582 | { | 1582 | { |
1583 | m_log.Info("[BASE HTTP SERVER]: Starting up HTTP Server"); | ||
1584 | StartHTTP(); | 1583 | StartHTTP(); |
1585 | } | 1584 | } |
1586 | 1585 | ||
@@ -1588,7 +1587,6 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1588 | { | 1587 | { |
1589 | try | 1588 | try |
1590 | { | 1589 | { |
1591 | m_log.Debug("[BASE HTTP SERVER]: Spawned main thread OK"); | ||
1592 | //m_httpListener = new HttpListener(); | 1590 | //m_httpListener = new HttpListener(); |
1593 | NotSocketErrors = 0; | 1591 | NotSocketErrors = 0; |
1594 | if (!m_ssl) | 1592 | if (!m_ssl) |