OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* More console related changes.

afrisby
Adam Frisby 2007-07-24 04:10:08 +00:00
parent 3cbc1e011d
commit ad5548de9f
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/Console/LogBase.cs
View File

@ -114,6 +114,7 @@ namespace OpenSim.Framework.Console
/// <param name="args">WriteLine-style message arguments</param> /// <param name="args">WriteLine-style message arguments</param>
public void Warn(string sender, string format, params object[] args) public void Warn(string sender, string format, params object[] args)
{ {
sender = sender.ToUpper();
int colIdx = (sender.GetHashCode() % 6) + 9; int colIdx = (sender.GetHashCode() % 6) + 9;
ConsoleColor col = (ConsoleColor)colIdx; ConsoleColor col = (ConsoleColor)colIdx;
@ -141,6 +142,7 @@ namespace OpenSim.Framework.Console
/// <param name="args">WriteLine-style message arguments</param> /// <param name="args">WriteLine-style message arguments</param>
public void Notice(string sender, string format, params object[] args) public void Notice(string sender, string format, params object[] args)
{ {
sender = sender.ToUpper();
int colIdx = (sender.GetHashCode() % 6) + 9; int colIdx = (sender.GetHashCode() % 6) + 9;
ConsoleColor col = (ConsoleColor)colIdx; ConsoleColor col = (ConsoleColor)colIdx;
@ -168,6 +170,7 @@ namespace OpenSim.Framework.Console
/// <param name="args">WriteLine-style message arguments</param> /// <param name="args">WriteLine-style message arguments</param>
public void Error(string sender, string format, params object[] args) public void Error(string sender, string format, params object[] args)
{ {
sender = sender.ToUpper();
int colIdx = (sender.GetHashCode() % 6) + 9; int colIdx = (sender.GetHashCode() % 6) + 9;
ConsoleColor col = (ConsoleColor)colIdx; ConsoleColor col = (ConsoleColor)colIdx;
@ -195,6 +198,7 @@ namespace OpenSim.Framework.Console
/// <param name="args">WriteLine-style message arguments</param> /// <param name="args">WriteLine-style message arguments</param>
public void Verbose(string sender, string format, params object[] args) public void Verbose(string sender, string format, params object[] args)
{ {
sender = sender.ToUpper();
int colIdx = (sender.GetHashCode() % 6) + 9; int colIdx = (sender.GetHashCode() % 6) + 9;
ConsoleColor col = (ConsoleColor)colIdx; ConsoleColor col = (ConsoleColor)colIdx;
@ -222,6 +226,7 @@ namespace OpenSim.Framework.Console
/// <param name="args">WriteLine-style message arguments</param> /// <param name="args">WriteLine-style message arguments</param>
public void Status(string sender, string format, params object[] args) public void Status(string sender, string format, params object[] args)
{ {
sender = sender.ToUpper();
int colIdx = (sender.GetHashCode() % 6) + 9; int colIdx = (sender.GetHashCode() % 6) + 9;
ConsoleColor col = (ConsoleColor)colIdx; ConsoleColor col = (ConsoleColor)colIdx;

2
OpenSim/Grid/UserServer/Main.cs
View File

@ -98,7 +98,7 @@ namespace OpenSim.Grid.UserServer
httpServer.AddStreamHandler( new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod )); httpServer.AddStreamHandler( new RestStreamHandler("DELETE", "/usersessions/", m_userManager.RestDeleteUserSessionMethod ));
httpServer.Start(); httpServer.Start();
m_console.Status("Userserver 0.3 - Startup complete"); m_console.Status("SERVER", "Userserver 0.3 - Startup complete");
} }

8
OpenSim/Region/ClientStack/UDPServer.cs
View File

@ -138,20 +138,20 @@ namespace OpenSim.Region.ClientStack
public void ServerListener() public void ServerListener()
{ {
m_log.Status("UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort); m_log.Status("SERVER", "UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort);
ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort); ServerIncoming = new IPEndPoint(IPAddress.Parse("0.0.0.0"), listenPort);
Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
Server.Bind(ServerIncoming); Server.Bind(ServerIncoming);
m_log.Verbose("UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen"); m_log.Verbose("SERVER", "UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen");
ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
epSender = (EndPoint)ipeSender; epSender = (EndPoint)ipeSender;
ReceivedData = new AsyncCallback(this.OnReceivedData); ReceivedData = new AsyncCallback(this.OnReceivedData);
Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
m_log.Verbose("UDPServer.cs:ServerListener() - Listening..."); m_log.Verbose("SERVER", "UDPServer.cs:ServerListener() - Listening...");
} }