From e33ac50388b5b9d6d06c58c45e2ea6f17e9b987f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 14 Jul 2013 14:31:20 -0700
Subject: HG UAS: Moved hg-session data from memory to DB storage. This makes
it so that traveling info survives Robust resets. It should also eliminate
the cause of empty IP addresses in agent circuit data that we saw in CC grid.
MySQL only.
---
OpenSim/Data/MySQL/MySQLHGTravelData.cs | 70 ++++++++++++++++++++++
.../Data/MySQL/Resources/HGTravelStore.migrations | 17 ++++++
2 files changed, 87 insertions(+)
create mode 100644 OpenSim/Data/MySQL/MySQLHGTravelData.cs
create mode 100644 OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
(limited to 'OpenSim/Data/MySQL')
diff --git a/OpenSim/Data/MySQL/MySQLHGTravelData.cs b/OpenSim/Data/MySQL/MySQLHGTravelData.cs
new file mode 100644
index 0000000..1efbfc3
--- /dev/null
+++ b/OpenSim/Data/MySQL/MySQLHGTravelData.cs
@@ -0,0 +1,70 @@
+/*
+ * 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.Collections.Generic;
+using System.Data;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using MySql.Data.MySqlClient;
+
+namespace OpenSim.Data.MySQL
+{
+ ///
+ /// A MySQL Interface for user grid data
+ ///
+ public class MySQLHGTravelData : MySQLGenericTableHandler, IHGTravelingData
+ {
+// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+ public MySQLHGTravelData(string connectionString, string realm) : base(connectionString, realm, "HGTravelStore") { }
+
+ public HGTravelingData Get(UUID sessionID)
+ {
+ HGTravelingData[] ret = Get("SessionID", sessionID.ToString());
+
+ if (ret.Length == 0)
+ return null;
+
+ return ret[0];
+ }
+
+ public HGTravelingData[] GetSessions(UUID userID)
+ {
+ return base.Get("UserID", userID.ToString());
+ }
+
+ public bool Delete(UUID sessionID)
+ {
+ return Delete("SessionID", sessionID.ToString());
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
new file mode 100644
index 0000000..a0c9ebe
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
@@ -0,0 +1,17 @@
+:VERSION 1 # --------------------------
+
+BEGIN;
+
+CREATE TABLE `hg_traveling_data` (
+ `SessionID` VARCHAR(36) NOT NULL,
+ `UserID` VARCHAR(36) NOT NULL,
+ `GridExternalName` VARCHAR(255) NOT NULL DEFAULT '',
+ `ServiceToken` VARCHAR(255) NOT NULL DEFAULT '',
+ `ClientIPAddress` VARCHAR(16) NOT NULL DEFAULT '',
+ `MyIPAddress` VARCHAR(16) NOT NULL DEFAULT '',
+ PRIMARY KEY (`SessionID`),
+ KEY (`UserID`)
+) ENGINE=InnoDB;
+
+COMMIT;
+
--
cgit v1.1