* Escaped log messages properly when logging to DB

* World map textures are now checked against DBNull before returning
* MySQL now informs when it gets a connection
* "Fastmode" support added to world map queries (MySQL-only), disabled by default.

1 files changed, 12 insertions, 2 deletions

diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
index 1f7413f..aee18b9 100644
--- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
+++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
@@ -33,6 +33,8 @@ namespace OpenGrid.Framework.Data.MySQL
                 dbcon = new MySqlConnection(connectionString);

 

                 dbcon.Open();

+

+                System.Console.WriteLine("MySQL connection established");

             }

             catch (Exception e)

             {

@@ -120,7 +122,15 @@ namespace OpenGrid.Framework.Data.MySQL
                 retval.regionUserSendKey = (string)reader["regionUserSendKey"];

 

                 // World Map Addition

-                retval.regionMapTextureID = new libsecondlife.LLUUID((string)reader["regionMapTexture"]);

+                string tempRegionMap = reader["regionMapTexture"].ToString();

+                if (tempRegionMap != "")

+                {

+                    retval.regionMapTextureID = new libsecondlife.LLUUID(tempRegionMap);

+                }

+                else

+                {

+                    retval.regionMapTextureID = new libsecondlife.LLUUID();

+                }

             }

             else

             {

@@ -209,7 +219,7 @@ namespace OpenGrid.Framework.Data.MySQL
 

         public bool insertLogRow(string serverDaemon, string target, string methodCall, string arguments, int priority, string logMessage)

         {

-            string sql = "INSERT INTO logs (target, server, method, arguments, priority, message) VALUES (";

+            string sql = "INSERT INTO logs (`target`, `server`, `method`, `arguments`, `priority`, `message`) VALUES ";

             sql += "(?target, ?server, ?method, ?arguments, ?priority, ?message)";

 

             Dictionary<string, string> parameters = new Dictionary<string, string>();