* 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

4 files changed, 10 insertions, 10 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
index b458b18..33681fd 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactionManager.cs
@@ -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));                        
                         }
                     }
                 }
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
index c54dd7d..3799510 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
@@ -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));                
                 }            
             }
         }
diff --git a/OpenSim/Framework/Console/OpenSimAppender.cs b/OpenSim/Framework/Console/OpenSimAppender.cs
index 6b1ba39..1835d18 100644
--- a/OpenSim/Framework/Console/OpenSimAppender.cs
+++ b/OpenSim/Framework/Console/OpenSimAppender.cs
@@ -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);
             }
         }
 
@@ -79,4 +79,4 @@ namespace OpenSim.Framework.Console
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ClientStack/PacketServer.cs b/OpenSim/Region/ClientStack/PacketServer.cs
index 7036de93..5d8234a 100644
--- a/OpenSim/Region/ClientStack/PacketServer.cs
+++ b/OpenSim/Region/ClientStack/PacketServer.cs
@@ -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);