aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLDataStore.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLDataStore.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLDataStore.cs46
1 files changed, 23 insertions, 23 deletions
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index 1f9ea70..33981de 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Data.MySQL
88 m_dataSet = new DataSet(); 88 m_dataSet = new DataSet();
89 this.persistPrimInventories = persistPrimInventories; 89 this.persistPrimInventories = persistPrimInventories;
90 90
91 m_log.Info("[DATASTORE]: MySql - connecting: " + connectionstring); 91 m_log.Info("[REGION DB]: MySql - connecting: " + connectionstring);
92 m_connection = new MySqlConnection(connectionstring); 92 m_connection = new MySqlConnection(connectionstring);
93 93
94 TestTablesVersionable(m_connection); 94 TestTablesVersionable(m_connection);
@@ -256,7 +256,7 @@ namespace OpenSim.Data.MySQL
256 { 256 {
257 if ((prim.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Physics) == 0) 257 if ((prim.GetEffectiveObjectFlags() & (uint) LLObject.ObjectFlags.Physics) == 0)
258 { 258 {
259 m_log.Info("[DATASTORE]: Adding obj: " + obj.UUID + " to region: " + regionUUID); 259 m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
260 addPrim(prim, obj.UUID, regionUUID); 260 addPrim(prim, obj.UUID, regionUUID);
261 } 261 }
262 else 262 else
@@ -270,7 +270,7 @@ namespace OpenSim.Data.MySQL
270 270
271 public void RemoveObject(LLUUID obj, LLUUID regionUUID) 271 public void RemoveObject(LLUUID obj, LLUUID regionUUID)
272 { 272 {
273 m_log.InfoFormat("[DATASTORE]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID); 273 m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID);
274 274
275 DataTable prims = m_primTable; 275 DataTable prims = m_primTable;
276 DataTable shapes = m_shapeTable; 276 DataTable shapes = m_shapeTable;
@@ -334,7 +334,7 @@ namespace OpenSim.Data.MySQL
334 lock (m_dataSet) 334 lock (m_dataSet)
335 { 335 {
336 DataRow[] primsForRegion = prims.Select(byRegion, orderByParent); 336 DataRow[] primsForRegion = prims.Select(byRegion, orderByParent);
337 m_log.Info("[DATASTORE]: " + 337 m_log.Info("[REGION DB]: " +
338 "Loaded " + primsForRegion.Length + " prims for region: " + regionUUID); 338 "Loaded " + primsForRegion.Length + " prims for region: " + regionUUID);
339 339
340 foreach (DataRow primRow in primsForRegion) 340 foreach (DataRow primRow in primsForRegion)
@@ -390,11 +390,11 @@ namespace OpenSim.Data.MySQL
390 } 390 }
391 catch (Exception e) 391 catch (Exception e)
392 { 392 {
393 m_log.Error("[DATASTORE]: Failed create prim object, exception and data follows"); 393 m_log.Error("[REGION DB]: Failed create prim object, exception and data follows");
394 m_log.Info("[DATASTORE]: " + e.ToString()); 394 m_log.Info("[REGION DB]: " + e.ToString());
395 foreach (DataColumn col in prims.Columns) 395 foreach (DataColumn col in prims.Columns)
396 { 396 {
397 m_log.Info("[DATASTORE]: Col: " + col.ColumnName + " => " + primRow[col]); 397 m_log.Info("[REGION DB]: Col: " + col.ColumnName + " => " + primRow[col]);
398 } 398 }
399 } 399 }
400 } 400 }
@@ -438,7 +438,7 @@ namespace OpenSim.Data.MySQL
438 public void StoreTerrain(double[,] ter, LLUUID regionID) 438 public void StoreTerrain(double[,] ter, LLUUID regionID)
439 { 439 {
440 int revision = Util.UnixTimeSinceEpoch(); 440 int revision = Util.UnixTimeSinceEpoch();
441 m_log.Info("[DATASTORE]: Storing terrain revision r" + revision.ToString()); 441 m_log.Info("[REGION DB]: Storing terrain revision r" + revision.ToString());
442 442
443 DataTable terrain = m_dataSet.Tables["terrain"]; 443 DataTable terrain = m_dataSet.Tables["terrain"];
444 lock (m_dataSet) 444 lock (m_dataSet)
@@ -493,11 +493,11 @@ namespace OpenSim.Data.MySQL
493 } 493 }
494 else 494 else
495 { 495 {
496 m_log.Info("[DATASTORE]: No terrain found for region"); 496 m_log.Info("[REGION DB]: No terrain found for region");
497 return null; 497 return null;
498 } 498 }
499 499
500 m_log.Info("[DATASTORE]: Loaded terrain revision r" + rev.ToString()); 500 m_log.Info("[REGION DB]: Loaded terrain revision r" + rev.ToString());
501 } 501 }
502 } 502 }
503 return terret; 503 return terret;
@@ -1329,7 +1329,7 @@ namespace OpenSim.Data.MySQL
1329 if (!persistPrimInventories) 1329 if (!persistPrimInventories)
1330 return; 1330 return;
1331 1331
1332 m_log.InfoFormat("[DATASTORE]: Persisting Prim Inventory with prim ID {0}", primID); 1332 m_log.InfoFormat("[REGION DB]: Persisting Prim Inventory with prim ID {0}", primID);
1333 1333
1334 // For now, we're just going to crudely remove all the previous inventory items 1334 // For now, we're just going to crudely remove all the previous inventory items
1335 // no matter whether they have changed or not, and replace them with the current set. 1335 // no matter whether they have changed or not, and replace them with the current set.
@@ -1341,7 +1341,7 @@ namespace OpenSim.Data.MySQL
1341 foreach (TaskInventoryItem newItem in items) 1341 foreach (TaskInventoryItem newItem in items)
1342 { 1342 {
1343// m_log.InfoFormat( 1343// m_log.InfoFormat(
1344// "[DATASTORE]: " + 1344// "[REGION DB]: " +
1345// "Adding item {0}, {1} to prim ID {2}", 1345// "Adding item {0}, {1} to prim ID {2}",
1346// newItem.Name, newItem.ItemID, newItem.ParentPartID); 1346// newItem.Name, newItem.ItemID, newItem.ParentPartID);
1347 1347
@@ -1572,8 +1572,8 @@ namespace OpenSim.Data.MySQL
1572 } 1572 }
1573 catch (Exception ex) 1573 catch (Exception ex)
1574 { 1574 {
1575 m_log.Error("[MySql]: Error connecting to MySQL server: " + ex.Message); 1575 m_log.Error("[REGION DB]: Error connecting to MySQL server: " + ex.Message);
1576 m_log.Error("[MySql]: Application is terminating!"); 1576 m_log.Error("[REGION DB]: Application is terminating!");
1577 Thread.CurrentThread.Abort(); 1577 Thread.CurrentThread.Abort();
1578 } 1578 }
1579 } 1579 }
@@ -1584,7 +1584,7 @@ namespace OpenSim.Data.MySQL
1584 } 1584 }
1585 catch (MySqlException e) 1585 catch (MySqlException e)
1586 { 1586 {
1587 m_log.WarnFormat("[MySql]: Primitives Table Already Exists: {0}", e); 1587 m_log.WarnFormat("[REGION DB]: Primitives Table Already Exists: {0}", e);
1588 } 1588 }
1589 1589
1590 try 1590 try
@@ -1593,7 +1593,7 @@ namespace OpenSim.Data.MySQL
1593 } 1593 }
1594 catch (MySqlException e) 1594 catch (MySqlException e)
1595 { 1595 {
1596 m_log.WarnFormat("[MySql]: Shapes Table Already Exists: {0}", e); 1596 m_log.WarnFormat("[REGION DB]: Shapes Table Already Exists: {0}", e);
1597 } 1597 }
1598 1598
1599 try 1599 try
@@ -1602,7 +1602,7 @@ namespace OpenSim.Data.MySQL
1602 } 1602 }
1603 catch (MySqlException e) 1603 catch (MySqlException e)
1604 { 1604 {
1605 m_log.WarnFormat("[MySql]: Items Table Already Exists: {0}", e); 1605 m_log.WarnFormat("[REGION DB]: Items Table Already Exists: {0}", e);
1606 } 1606 }
1607 1607
1608 try 1608 try
@@ -1611,7 +1611,7 @@ namespace OpenSim.Data.MySQL
1611 } 1611 }
1612 catch (MySqlException e) 1612 catch (MySqlException e)
1613 { 1613 {
1614 m_log.WarnFormat("[MySql]: Terrain Table Already Exists: {0}", e); 1614 m_log.WarnFormat("[REGION DB]: Terrain Table Already Exists: {0}", e);
1615 } 1615 }
1616 1616
1617 //try 1617 //try
@@ -1629,7 +1629,7 @@ namespace OpenSim.Data.MySQL
1629 } 1629 }
1630 catch (MySqlException e) 1630 catch (MySqlException e)
1631 { 1631 {
1632 m_log.WarnFormat("[MySql]: LandAccessList Table Already Exists: {0}", e); 1632 m_log.WarnFormat("[REGION DB]: LandAccessList Table Already Exists: {0}", e);
1633 } 1633 }
1634 conn.Close(); 1634 conn.Close();
1635 } 1635 }
@@ -1682,7 +1682,7 @@ namespace OpenSim.Data.MySQL
1682 { 1682 {
1683 if (!tmpDS.Tables["prims"].Columns.Contains(col.ColumnName)) 1683 if (!tmpDS.Tables["prims"].Columns.Contains(col.ColumnName))
1684 { 1684 {
1685 m_log.Info("[DATASTORE]: Missing required column:" + col.ColumnName); 1685 m_log.Info("[REGION DB]: Missing required column:" + col.ColumnName);
1686 return false; 1686 return false;
1687 } 1687 }
1688 } 1688 }
@@ -1691,7 +1691,7 @@ namespace OpenSim.Data.MySQL
1691 { 1691 {
1692 if (!tmpDS.Tables["primshapes"].Columns.Contains(col.ColumnName)) 1692 if (!tmpDS.Tables["primshapes"].Columns.Contains(col.ColumnName))
1693 { 1693 {
1694 m_log.Info("[DATASTORE]: Missing required column:" + col.ColumnName); 1694 m_log.Info("[REGION DB]: Missing required column:" + col.ColumnName);
1695 return false; 1695 return false;
1696 } 1696 }
1697 } 1697 }
@@ -1702,7 +1702,7 @@ namespace OpenSim.Data.MySQL
1702 { 1702 {
1703 if (!tmpDS.Tables["terrain"].Columns.Contains(col.ColumnName)) 1703 if (!tmpDS.Tables["terrain"].Columns.Contains(col.ColumnName))
1704 { 1704 {
1705 m_log.Info("[DATASTORE]: Missing require column:" + col.ColumnName); 1705 m_log.Info("[REGION DB]: Missing require column:" + col.ColumnName);
1706 return false; 1706 return false;
1707 } 1707 }
1708 } 1708 }
@@ -1711,7 +1711,7 @@ namespace OpenSim.Data.MySQL
1711 { 1711 {
1712 if (!tmpDS.Tables["land"].Columns.Contains(col.ColumnName)) 1712 if (!tmpDS.Tables["land"].Columns.Contains(col.ColumnName))
1713 { 1713 {
1714 m_log.Info("[DATASTORE]: Missing require column:" + col.ColumnName); 1714 m_log.Info("[REGION DB]: Missing require column:" + col.ColumnName);
1715 return false; 1715 return false;
1716 } 1716 }
1717 } 1717 }