aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2009-12-28 18:59:38 +0000
committerMelanie2009-12-28 18:59:38 +0000
commit5b69f58aae784fc12e25ecdffeca6cffb9942403 (patch)
tree307b7b9fdce7c5988925ff925da76911fa46fabf
parentAdd the migration for friends and guard the presence Report function (diff)
downloadopensim-SC_OLD-5b69f58aae784fc12e25ecdffeca6cffb9942403.zip
opensim-SC_OLD-5b69f58aae784fc12e25ecdffeca6cffb9942403.tar.gz
opensim-SC_OLD-5b69f58aae784fc12e25ecdffeca6cffb9942403.tar.bz2
opensim-SC_OLD-5b69f58aae784fc12e25ecdffeca6cffb9942403.tar.xz
Make Migratons continue int he face of an error. This is required for the
friends migration, which MAY error out if the old friends table is not in the same database as the new one being created. This error is nonfatal, it would only mean that friends will not be migrated automatically. It would bite people with nonstandard configurations.
-rw-r--r--OpenSim/Data/Migration.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index e51dc22..5a9b01b 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -138,7 +138,14 @@ namespace OpenSim.Data
138 cmd.CommandText = kvp.Value; 138 cmd.CommandText = kvp.Value;
139 // we need to up the command timeout to infinite as we might be doing long migrations. 139 // we need to up the command timeout to infinite as we might be doing long migrations.
140 cmd.CommandTimeout = 0; 140 cmd.CommandTimeout = 0;
141 cmd.ExecuteNonQuery(); 141 try
142 {
143 cmd.ExecuteNonQuery();
144 }
145 catch (Exception e)
146 {
147 m_log.Debug("[MIGRATIONS]: An error has occurred in the migration. This may mean you could see errors trying to run OpenSim. If you see database related errors, you will need to fix the issue manually. Continuing.");
148 }
142 149
143 if (version == 0) 150 if (version == 0)
144 { 151 {