* Change logger to handle [<entry>] where <entry> contains non alphabetic characters

* Change logger to not print extra line if [<entry>] <text> like string is not logged
* Remove more of my previous chatty debugging statements
ThreadPoolClientBranch
Justin Clarke Casey 2008-02-09 01:53:57 +00:00
parent a50a8376d6
commit d546859bc1
4 changed files with 10 additions and 10 deletions

View File

@ -106,7 +106,7 @@ namespace OpenSim.Framework.Communications.Cache
// XXX Weak ass way of doing this by directly manipulating this public dictionary, purely temporary
transactions.XferUploaders.Remove(uploader.TransactionID);
m_log.Info(String.Format("[ASSET TRANSACTIONS] Current uploaders: {0}", transactions.XferUploaders.Count));
//m_log.Info(String.Format("[ASSET TRANSACTIONS] Current uploaders: {0}", transactions.XferUploaders.Count));
}
}
}

View File

@ -108,14 +108,14 @@ namespace OpenSim.Framework.Communications.Cache
// Remove the uploader once the uploader is complete
if (uploaderFound != null)
{
m_log.Info(
String.Format(
"[ASSET TRANSACTIONS] Removing asset xfer uploader with transfer id {0}, transaction {1}",
xferID, uploaderFound.TransactionID));
// m_log.Info(
// String.Format(
// "[ASSET TRANSACTIONS] Removing asset xfer uploader with transfer id {0}, transaction {1}",
// xferID, uploaderFound.TransactionID));
XferUploaders.Remove(uploaderFound.TransactionID);
m_log.Info(String.Format("[ASSET TRANSACTIONS] Current uploaders: {0}", XferUploaders.Count));
//m_log.Info(String.Format("[ASSET TRANSACTIONS] Current uploaders: {0}", XferUploaders.Count));
}
}
}

View File

@ -15,7 +15,7 @@ namespace OpenSim.Framework.Console
override protected void Append(LoggingEvent le)
{
string loggingMessage = RenderLoggingEvent(le);
string regex = @"^(?<Front>.*?)\[(?<Category>\w+)\]:?(?<End>.*)";
string regex = @"^(?<Front>.*?)\[(?<Category>[^\]]+)\]:?(?<End>.*)";
Regex RE = new Regex(regex, RegexOptions.Multiline);
MatchCollection matches = RE.Matches(loggingMessage);
@ -44,7 +44,7 @@ namespace OpenSim.Framework.Console
}
else
{
System.Console.WriteLine(loggingMessage);
System.Console.Write(loggingMessage);
}
}

View File

@ -141,7 +141,7 @@ namespace OpenSim.Region.ClientStack
/// <param name="client"></param>
public virtual void CloseClient(IClientAPI client)
{
m_log.Info("PacketServer:CloseClient()");
//m_log.Info("PacketServer:CloseClient()");
CloseCircuit(client.CircuitCode);
m_scene.ClientManager.Remove(client.CircuitCode);