diff options
Diffstat (limited to 'OpenSim.Servers')
-rw-r--r-- | OpenSim.Servers/BaseHttpServer.cs | 7 | ||||
-rw-r--r-- | OpenSim.Servers/OpenGridProtocol.cs | 11 |
2 files changed, 10 insertions, 8 deletions
diff --git a/OpenSim.Servers/BaseHttpServer.cs b/OpenSim.Servers/BaseHttpServer.cs index bb8f0ad..bd5eed4 100644 --- a/OpenSim.Servers/BaseHttpServer.cs +++ b/OpenSim.Servers/BaseHttpServer.cs | |||
@@ -7,6 +7,7 @@ using System.Threading; | |||
7 | //using OpenSim.CAPS; | 7 | //using OpenSim.CAPS; |
8 | using Nwc.XmlRpc; | 8 | using Nwc.XmlRpc; |
9 | using System.Collections; | 9 | using System.Collections; |
10 | using OpenSim.Framework.Console; | ||
10 | 11 | ||
11 | namespace OpenSim.Servers | 12 | namespace OpenSim.Servers |
12 | { | 13 | { |
@@ -219,7 +220,7 @@ namespace OpenSim.Servers | |||
219 | 220 | ||
220 | public void Start() | 221 | public void Start() |
221 | { | 222 | { |
222 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("BaseHttpServer.cs: Starting up HTTP Server"); | 223 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW,"BaseHttpServer.cs: Starting up HTTP Server"); |
223 | 224 | ||
224 | m_workerThread = new Thread(new ThreadStart(StartHTTP)); | 225 | m_workerThread = new Thread(new ThreadStart(StartHTTP)); |
225 | m_workerThread.IsBackground = true; | 226 | m_workerThread.IsBackground = true; |
@@ -230,7 +231,7 @@ namespace OpenSim.Servers | |||
230 | { | 231 | { |
231 | try | 232 | try |
232 | { | 233 | { |
233 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("BaseHttpServer.cs: StartHTTP() - Spawned main thread OK"); | 234 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW,"BaseHttpServer.cs: StartHTTP() - Spawned main thread OK"); |
234 | m_httpListener = new HttpListener(); | 235 | m_httpListener = new HttpListener(); |
235 | 236 | ||
236 | m_httpListener.Prefixes.Add("http://+:" + m_port + "/"); | 237 | m_httpListener.Prefixes.Add("http://+:" + m_port + "/"); |
@@ -245,7 +246,7 @@ namespace OpenSim.Servers | |||
245 | } | 246 | } |
246 | catch (Exception e) | 247 | catch (Exception e) |
247 | { | 248 | { |
248 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.Message); | 249 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM,e.Message); |
249 | } | 250 | } |
250 | } | 251 | } |
251 | } | 252 | } |
diff --git a/OpenSim.Servers/OpenGridProtocol.cs b/OpenSim.Servers/OpenGridProtocol.cs index 55c47b4..66ca497 100644 --- a/OpenSim.Servers/OpenGridProtocol.cs +++ b/OpenSim.Servers/OpenGridProtocol.cs | |||
@@ -7,6 +7,7 @@ using System.Text.RegularExpressions; | |||
7 | using System.Threading; | 7 | using System.Threading; |
8 | using Nwc.XmlRpc; | 8 | using Nwc.XmlRpc; |
9 | using System.Collections; | 9 | using System.Collections; |
10 | using OpenSim.Framework.Console; | ||
10 | 11 | ||
11 | namespace OpenSim.Servers | 12 | namespace OpenSim.Servers |
12 | { | 13 | { |
@@ -35,8 +36,8 @@ namespace OpenSim.Servers | |||
35 | 36 | ||
36 | private void DoWork() | 37 | private void DoWork() |
37 | { | 38 | { |
38 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: ClientHandler.DoWork() - Got new client"); | 39 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW,"OpenGridProtocol.cs: ClientHandler.DoWork() - Got new client"); |
39 | this.WriteLine("OpenSim 0.1, running OGS protocol 1.0"); | 40 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.NORMAL, "OpenSim 0.1, running OGS protocol 1.0"); |
40 | 41 | ||
41 | } | 42 | } |
42 | 43 | ||
@@ -55,7 +56,7 @@ namespace OpenSim.Servers | |||
55 | 56 | ||
56 | public void Start() | 57 | public void Start() |
57 | { | 58 | { |
58 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: Start() - Opening server socket"); | 59 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW,"OpenGridProtocol.cs: Start() - Opening server socket"); |
59 | 60 | ||
60 | m_clients = new ArrayList(); | 61 | m_clients = new ArrayList(); |
61 | m_workerThread = new Thread(new ThreadStart(StartServerSocket)); | 62 | m_workerThread = new Thread(new ThreadStart(StartServerSocket)); |
@@ -67,7 +68,7 @@ namespace OpenSim.Servers | |||
67 | { | 68 | { |
68 | try | 69 | try |
69 | { | 70 | { |
70 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: StartServerSocket() - Spawned main thread OK"); | 71 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW,"OpenGridProtocol.cs: StartServerSocket() - Spawned main thread OK"); |
71 | 72 | ||
72 | 73 | ||
73 | m_IPendpoint = new IPEndPoint(IPAddress.Any, m_port); | 74 | m_IPendpoint = new IPEndPoint(IPAddress.Any, m_port); |
@@ -87,7 +88,7 @@ namespace OpenSim.Servers | |||
87 | } | 88 | } |
88 | catch (Exception e) | 89 | catch (Exception e) |
89 | { | 90 | { |
90 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.Message); | 91 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM,e.Message); |
91 | } | 92 | } |
92 | } | 93 | } |
93 | } | 94 | } |