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

* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
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 // XXX Weak ass way of doing this by directly manipulating this public dictionary, purely temporary
transactions.XferUploaders.Remove(uploader.TransactionID); 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));
} }
} }
} }

10
OpenSim/Framework/Communications/Cache/AssetTransactions.cs
View File

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

6
OpenSim/Framework/Console/OpenSimAppender.cs
View File

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

2
OpenSim/Region/ClientStack/PacketServer.cs
View File

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