2 files changed, 162 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs
index a75ff62..9b1b1a3 100644
--- a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-namespace OpenSim.Region.CoreModules.Avatar.Attachments
+namespace OpenSim.Region.CoreModules.Statistics.Logging
 {
    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BinaryLoggingModule")]
    public class BinaryLoggingModule : INonSharedRegionModule
diff --git a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs
new file mode 100755
index 0000000..65e4c90
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System;
+using System.IO;
+using System.Text;
+using log4net;
+namespace OpenSim.Region.CoreModules.Framework.Statistics.Logging
+{
+    /// <summary>
+    /// Class for writing a high performance, high volume log file.
+    /// Sometimes, to debug, one has a high volume logging to do and the regular
+    /// log file output is not appropriate.
+    /// Create a new instance with the parameters needed and
+    /// call Write() to output a line. Call Close() when finished.
+    /// If created with no parameters, it will not log anything.
+    /// </summary>
+    public class LogWriter : IDisposable
+    {
+        public bool Enabled { get; private set; }
+        private string m_logDirectory = ".";
+        private int m_logMaxFileTimeMin = 5;    // 5 minutes
+        public String LogFileHeader { get; set; }
+        private StreamWriter m_logFile = null;
+        private TimeSpan m_logFileLife;
+        private DateTime m_logFileEndTime;
+        private Object m_logFileWriteLock = new Object();
+        // set externally when debugging. If let 'null', this does not write any error messages.
+        public ILog ErrorLogger = null;
+        private string LogHeader = "[LOG WRITER]";
+        /// <summary>
+        /// Create a log writer that will not write anything. Good for when not enabled
+        /// but the write statements are still in the code.
+        /// </summary>
+        public LogWriter()
+        {
+            Enabled = false;
+            m_logFile = null;
+        }
+        /// <summary>
+        /// Create a log writer instance.
+        /// </summary>
+        /// <param name="dir">The directory to create the log file in. May be 'null' for default.</param>
+        /// <param name="headr">The characters that begin the log file name. May be 'null' for default.</param>
+        /// <param name="maxFileTime">Maximum age of a log file in minutes. If zero, will set default.</param>
+        public LogWriter(string dir, string headr, int maxFileTime)
+        {
+            m_logDirectory = dir == null ? "." : dir;
+            LogFileHeader = headr == null ? "log-" : headr;
+            m_logMaxFileTimeMin = maxFileTime;
+            if (m_logMaxFileTimeMin < 1)
+                m_logMaxFileTimeMin = 5;
+            m_logFileLife = new TimeSpan(0, m_logMaxFileTimeMin, 0);
+            m_logFileEndTime = DateTime.Now + m_logFileLife;
+            Enabled = true;
+        }
+        public void Dispose()
+        {
+            this.Close();
+        }
+        public void Close()
+        {
+            Enabled = false;
+            if (m_logFile != null)
+            {
+                m_logFile.Close();
+                m_logFile.Dispose();
+                m_logFile = null;
+            }
+        }
+        public void Write(string line, params object[] args)
+        {
+            if (!Enabled) return;
+            Write(String.Format(line, args));
+        }
+        public void Write(string line)
+        {
+            if (!Enabled) return;
+            try
+            {
+                lock (m_logFileWriteLock)
+                {
+                    DateTime now = DateTime.Now;
+                    if (m_logFile == null || now > m_logFileEndTime)
+                    {
+                        if (m_logFile != null)
+                        {
+                            m_logFile.Close();
+                            m_logFile.Dispose();
+                            m_logFile = null;
+                        }
+                        // First log file or time has expired, start writing to a new log file
+                        m_logFileEndTime = now + m_logFileLife;
+                        string path = (m_logDirectory.Length > 0 ? m_logDirectory
+                                    + System.IO.Path.DirectorySeparatorChar.ToString() : "")
+                                + String.Format("{0}{1}.log", LogFileHeader, now.ToString("yyyyMMddHHmmss"));
+                        m_logFile = new StreamWriter(File.Open(path, FileMode.Append, FileAccess.Write));
+                    }
+                    if (m_logFile != null)
+                    {
+                        StringBuilder buff = new StringBuilder(line.Length + 25);
+                        buff.Append(now.ToString("yyyyMMddHHmmssfff"));
+                        // buff.Append(now.ToString("yyyyMMddHHmmss"));
+                        buff.Append(",");
+                        buff.Append(line);
+                        buff.Append("\r\n");
+                        m_logFile.Write(buff.ToString());
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                if (ErrorLogger != null)
+                {
+                    ErrorLogger.ErrorFormat("{0}: FAILURE WRITING TO LOGFILE: {1}", LogHeader, e);
+                }
+                Enabled = false;
+            }
+            return;
+        }
+    }
+}
+\ No newline at end of file

diff --git a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs index a75ff62..9b1b1a3 100644 --- a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/BinaryLoggingModule.cs
@@ -39,7 +39,7 @@ using OpenSim.Region.Framework;
39	using OpenSim.Region.Framework.Interfaces;	39	using OpenSim.Region.Framework.Interfaces;
40	using OpenSim.Region.Framework.Scenes;	40	using OpenSim.Region.Framework.Scenes;
41		41
42	namespace OpenSim.Region.CoreModules.Avatar.Attachments	42	namespace OpenSim.Region.CoreModules.Statistics.Logging
43	{	43	{
44	[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BinaryLoggingModule")]	44	[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BinaryLoggingModule")]
45	public class BinaryLoggingModule : INonSharedRegionModule	45	public class BinaryLoggingModule : INonSharedRegionModule


diff --git a/OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs new file mode 100755 index 0000000..65e4c90 --- /dev/null +++ b/OpenSim/Region/CoreModules/Framework/Statistics/Logging/LogWriter.cs
@@ -0,0 +1,161 @@
		1	/*
		2	* Copyright (c) Contributors, http://opensimulator.org/
		3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
		4	*
		5	* Redistribution and use in source and binary forms, with or without
		6	* modification, are permitted provided that the following conditions are met:
		7	* * Redistributions of source code must retain the above copyright
		8	* notice, this list of conditions and the following disclaimer.
		9	* * Redistributions in binary form must reproduce the above copyright
		10	* notice, this list of conditions and the following disclaimer in the
		11	* documentation and/or other materials provided with the distribution.
		12	* * Neither the name of the OpenSimulator Project nor the
		13	* names of its contributors may be used to endorse or promote products
		14	* derived from this software without specific prior written permission.
		15	*
		16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
		17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
		18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
		19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
		20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
		21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
		22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
		23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
		24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
		25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		26	*/
		27
		28	using System;
		29	using System.IO;
		30	using System.Text;
		31	using log4net;
		32
		33	namespace OpenSim.Region.CoreModules.Framework.Statistics.Logging
		34	{
		35	/// <summary>
		36	/// Class for writing a high performance, high volume log file.
		37	/// Sometimes, to debug, one has a high volume logging to do and the regular
		38	/// log file output is not appropriate.
		39	/// Create a new instance with the parameters needed and
		40	/// call Write() to output a line. Call Close() when finished.
		41	/// If created with no parameters, it will not log anything.
		42	/// </summary>
		43	public class LogWriter : IDisposable
		44	{
		45	public bool Enabled { get; private set; }
		46
		47	private string m_logDirectory = ".";
		48	private int m_logMaxFileTimeMin = 5; // 5 minutes
		49	public String LogFileHeader { get; set; }
		50
		51	private StreamWriter m_logFile = null;
		52	private TimeSpan m_logFileLife;
		53	private DateTime m_logFileEndTime;
		54	private Object m_logFileWriteLock = new Object();
		55
		56	// set externally when debugging. If let 'null', this does not write any error messages.
		57	public ILog ErrorLogger = null;
		58	private string LogHeader = "[LOG WRITER]";
		59
		60	/// <summary>
		61	/// Create a log writer that will not write anything. Good for when not enabled
		62	/// but the write statements are still in the code.
		63	/// </summary>
		64	public LogWriter()
		65	{
		66	Enabled = false;
		67	m_logFile = null;
		68	}
		69
		70	/// <summary>
		71	/// Create a log writer instance.
		72	/// </summary>
		73	/// <param name="dir">The directory to create the log file in. May be 'null' for default.</param>
		74	/// <param name="headr">The characters that begin the log file name. May be 'null' for default.</param>
		75	/// <param name="maxFileTime">Maximum age of a log file in minutes. If zero, will set default.</param>
		76	public LogWriter(string dir, string headr, int maxFileTime)
		77	{
		78	m_logDirectory = dir == null ? "." : dir;
		79
		80	LogFileHeader = headr == null ? "log-" : headr;
		81
		82	m_logMaxFileTimeMin = maxFileTime;
		83	if (m_logMaxFileTimeMin < 1)
		84	m_logMaxFileTimeMin = 5;
		85
		86	m_logFileLife = new TimeSpan(0, m_logMaxFileTimeMin, 0);
		87	m_logFileEndTime = DateTime.Now + m_logFileLife;
		88
		89	Enabled = true;
		90	}
		91
		92	public void Dispose()
		93	{
		94	this.Close();
		95	}
		96
		97	public void Close()
		98	{
		99	Enabled = false;
		100	if (m_logFile != null)
		101	{
		102	m_logFile.Close();
		103	m_logFile.Dispose();
		104	m_logFile = null;
		105	}
		106	}
		107
		108	public void Write(string line, params object[] args)
		109	{
		110	if (!Enabled) return;
		111	Write(String.Format(line, args));
		112	}
		113
		114	public void Write(string line)
		115	{
		116	if (!Enabled) return;
		117	try
		118	{
		119	lock (m_logFileWriteLock)
		120	{
		121	DateTime now = DateTime.Now;
		122	if (m_logFile == null \|\| now > m_logFileEndTime)
		123	{
		124	if (m_logFile != null)
		125	{
		126	m_logFile.Close();
		127	m_logFile.Dispose();
		128	m_logFile = null;
		129	}
		130
		131	// First log file or time has expired, start writing to a new log file
		132	m_logFileEndTime = now + m_logFileLife;
		133	string path = (m_logDirectory.Length > 0 ? m_logDirectory
		134	+ System.IO.Path.DirectorySeparatorChar.ToString() : "")
		135	+ String.Format("{0}{1}.log", LogFileHeader, now.ToString("yyyyMMddHHmmss"));
		136	m_logFile = new StreamWriter(File.Open(path, FileMode.Append, FileAccess.Write));
		137	}
		138	if (m_logFile != null)
		139	{
		140	StringBuilder buff = new StringBuilder(line.Length + 25);
		141	buff.Append(now.ToString("yyyyMMddHHmmssfff"));
		142	// buff.Append(now.ToString("yyyyMMddHHmmss"));
		143	buff.Append(",");
		144	buff.Append(line);
		145	buff.Append("\r\n");
		146	m_logFile.Write(buff.ToString());
		147	}
		148	}
		149	}
		150	catch (Exception e)
		151	{
		152	if (ErrorLogger != null)
		153	{
		154	ErrorLogger.ErrorFormat("{0}: FAILURE WRITING TO LOGFILE: {1}", LogHeader, e);
		155	}
		156	Enabled = false;
		157	}
		158	return;
		159	}
		160	}
		161	} \ No newline at end of file