1 files changed, 105 insertions, 105 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
index 38f9fd3..2ba9c3d 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
@@ -1,105 +1,105 @@
-/*
+/*
-* Copyright (c) Contributors, http://www.openmetaverse.org/
+* Copyright (c) Contributors, http://www.openmetaverse.org/
-* See CONTRIBUTORS.TXT for a full list of copyright holders.
+* See CONTRIBUTORS.TXT for a full list of copyright holders.
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the OpenSim Project nor the
+*     * Neither the name of the OpenSim Project nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
+* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* 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
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using System;
+using System;
-namespace OpenSim.Framework.Data.MySQL
+namespace OpenSim.Framework.Data.MySQL
-{
+{
-    /// <summary>
+    /// <summary>
-    /// An interface to the log database for MySQL
+    /// An interface to the log database for MySQL
-    /// </summary>
+    /// </summary>
-    class MySQLLogData : ILogData
+    class MySQLLogData : ILogData
-    {
+    {
-        /// <summary>
+        /// <summary>
-        /// The database manager
+        /// The database manager
-        /// </summary>
+        /// </summary>
-        public MySQLManager database;
+        public MySQLManager database;
-        /// <summary>
+        /// <summary>
-        /// Artificial constructor called when the plugin is loaded
+        /// Artificial constructor called when the plugin is loaded
-        /// </summary>
+        /// </summary>
-        public void Initialise()
+        public void Initialise()
-        {
+        {
-            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
+            IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
-            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
+            string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
-            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");
+            string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");
-            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");
+            string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");
-            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");
+            string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");
-            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");
+            string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");
-            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
+            string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
-            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);
+            database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Saves a log item to the database
+        /// Saves a log item to the database
-        /// </summary>
+        /// </summary>
-        /// <param name="serverDaemon">The daemon triggering the event</param>
+        /// <param name="serverDaemon">The daemon triggering the event</param>
-        /// <param name="target">The target of the action (region / agent UUID, etc)</param>
+        /// <param name="target">The target of the action (region / agent UUID, etc)</param>
-        /// <param name="methodCall">The method call where the problem occured</param>
+        /// <param name="methodCall">The method call where the problem occured</param>
-        /// <param name="arguments">The arguments passed to the method</param>
+        /// <param name="arguments">The arguments passed to the method</param>
-        /// <param name="priority">How critical is this?</param>
+        /// <param name="priority">How critical is this?</param>
-        /// <param name="logMessage">The message to log</param>
+        /// <param name="logMessage">The message to log</param>
-        public void saveLog(string serverDaemon, string target, string methodCall, string arguments, int priority, string logMessage)
+        public void saveLog(string serverDaemon, string target, string methodCall, string arguments, int priority, string logMessage)
-        {
+        {
-            try
+            try
-            {
+            {
-                database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage);
+                database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage);
-            }
+            }
-            catch
+            catch
-            {
+            {
-                database.Reconnect();
+                database.Reconnect();
-            }
+            }
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Returns the name of this DB provider
+        /// Returns the name of this DB provider
-        /// </summary>
+        /// </summary>
-        /// <returns>A string containing the DB provider name</returns>
+        /// <returns>A string containing the DB provider name</returns>
-        public string getName()
+        public string getName()
-        {
+        {
-            return "MySQL Logdata Interface";
+            return "MySQL Logdata Interface";
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Closes the database provider
+        /// Closes the database provider
-        /// </summary>
+        /// </summary>
-        public void Close()
+        public void Close()
-        {
+        {
-            // Do nothing.
+            // Do nothing.
-        }
+        }
-        /// <summary>
+        /// <summary>
-        /// Returns the version of this DB provider
+        /// Returns the version of this DB provider
-        /// </summary>
+        /// </summary>
-        /// <returns>A string containing the provider version</returns>
+        /// <returns>A string containing the provider version</returns>
-        public string getVersion()
+        public string getVersion()
-        {
+        {
-            return "0.1";
+            return "0.1";
-        }
+        }
-    }
+    }
-}
+}

diff --git a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs index 38f9fd3..2ba9c3d 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLLogData.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLLogData.cs
@@ -1,105 +1,105 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://www.openmetaverse.org/	2	* Copyright (c) Contributors, http://www.openmetaverse.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSim Project nor the	12	* * Neither the name of the OpenSim Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	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	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	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	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.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*	26	*
27	*/	27	*/
28	using System;	28	using System;
29		29
30	namespace OpenSim.Framework.Data.MySQL	30	namespace OpenSim.Framework.Data.MySQL
31	{	31	{
32	/// <summary>	32	/// <summary>
33	/// An interface to the log database for MySQL	33	/// An interface to the log database for MySQL
34	/// </summary>	34	/// </summary>
35	class MySQLLogData : ILogData	35	class MySQLLogData : ILogData
36	{	36	{
37	/// <summary>	37	/// <summary>
38	/// The database manager	38	/// The database manager
39	/// </summary>	39	/// </summary>
40	public MySQLManager database;	40	public MySQLManager database;
41		41
42	/// <summary>	42	/// <summary>
43	/// Artificial constructor called when the plugin is loaded	43	/// Artificial constructor called when the plugin is loaded
44	/// </summary>	44	/// </summary>
45	public void Initialise()	45	public void Initialise()
46	{	46	{
47	IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");	47	IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
48	string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");	48	string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
49	string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");	49	string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");
50	string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");	50	string settingUsername = GridDataMySqlFile.ParseFileReadValue("username");
51	string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");	51	string settingPassword = GridDataMySqlFile.ParseFileReadValue("password");
52	string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");	52	string settingPooling = GridDataMySqlFile.ParseFileReadValue("pooling");
53	string settingPort = GridDataMySqlFile.ParseFileReadValue("port");	53	string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
54		54
55	database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);	55	database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);
56	}	56	}
57		57
58	/// <summary>	58	/// <summary>
59	/// Saves a log item to the database	59	/// Saves a log item to the database
60	/// </summary>	60	/// </summary>
61	/// <param name="serverDaemon">The daemon triggering the event</param>	61	/// <param name="serverDaemon">The daemon triggering the event</param>
62	/// <param name="target">The target of the action (region / agent UUID, etc)</param>	62	/// <param name="target">The target of the action (region / agent UUID, etc)</param>
63	/// <param name="methodCall">The method call where the problem occured</param>	63	/// <param name="methodCall">The method call where the problem occured</param>
64	/// <param name="arguments">The arguments passed to the method</param>	64	/// <param name="arguments">The arguments passed to the method</param>
65	/// <param name="priority">How critical is this?</param>	65	/// <param name="priority">How critical is this?</param>
66	/// <param name="logMessage">The message to log</param>	66	/// <param name="logMessage">The message to log</param>
67	public void saveLog(string serverDaemon, string target, string methodCall, string arguments, int priority, string logMessage)	67	public void saveLog(string serverDaemon, string target, string methodCall, string arguments, int priority, string logMessage)
68	{	68	{
69	try	69	try
70	{	70	{
71	database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage);	71	database.insertLogRow(serverDaemon, target, methodCall, arguments, priority, logMessage);
72	}	72	}
73	catch	73	catch
74	{	74	{
75	database.Reconnect();	75	database.Reconnect();
76	}	76	}
77	}	77	}
78		78
79	/// <summary>	79	/// <summary>
80	/// Returns the name of this DB provider	80	/// Returns the name of this DB provider
81	/// </summary>	81	/// </summary>
82	/// <returns>A string containing the DB provider name</returns>	82	/// <returns>A string containing the DB provider name</returns>
83	public string getName()	83	public string getName()
84	{	84	{
85	return "MySQL Logdata Interface";	85	return "MySQL Logdata Interface";
86	}	86	}
87		87
88	/// <summary>	88	/// <summary>
89	/// Closes the database provider	89	/// Closes the database provider
90	/// </summary>	90	/// </summary>
91	public void Close()	91	public void Close()
92	{	92	{
93	// Do nothing.	93	// Do nothing.
94	}	94	}
95		95
96	/// <summary>	96	/// <summary>
97	/// Returns the version of this DB provider	97	/// Returns the version of this DB provider
98	/// </summary>	98	/// </summary>
99	/// <returns>A string containing the provider version</returns>	99	/// <returns>A string containing the provider version</returns>
100	public string getVersion()	100	public string getVersion()
101	{	101	{
102	return "0.1";	102	return "0.1";
103	}	103	}
104	}	104	}
105	}	105	}