diff options
author | Justin Clark-Casey (justincc) | 2010-06-25 21:18:52 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-06-25 21:20:47 +0100 |
commit | 0f3d9e17c68da13d44b2dcaf7750dd869c7375ff (patch) | |
tree | 6b57ebbd093b18ce2f1763aa326b98c8db720b64 /OpenSim/Data/Migration.cs | |
parent | fix web request exception reporting properly this time (diff) | |
download | opensim-SC_OLD-0f3d9e17c68da13d44b2dcaf7750dd869c7375ff.zip opensim-SC_OLD-0f3d9e17c68da13d44b2dcaf7750dd869c7375ff.tar.gz opensim-SC_OLD-0f3d9e17c68da13d44b2dcaf7750dd869c7375ff.tar.bz2 opensim-SC_OLD-0f3d9e17c68da13d44b2dcaf7750dd869c7375ff.tar.xz |
minor: fix spelling mistake interupt -> interrupt in migrations
This is for mantis 4783
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/Migration.cs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs index 4f113a2..c177097 100644 --- a/OpenSim/Data/Migration.cs +++ b/OpenSim/Data/Migration.cs | |||
@@ -67,7 +67,6 @@ namespace OpenSim.Data | |||
67 | /// really want is the assembly of your database class. | 67 | /// really want is the assembly of your database class. |
68 | /// | 68 | /// |
69 | /// </summary> | 69 | /// </summary> |
70 | |||
71 | public class Migration | 70 | public class Migration |
72 | { | 71 | { |
73 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 72 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -173,8 +172,6 @@ namespace OpenSim.Data | |||
173 | ExecuteScript(_conn, script); | 172 | ExecuteScript(_conn, script); |
174 | } | 173 | } |
175 | 174 | ||
176 | |||
177 | |||
178 | public void Update() | 175 | public void Update() |
179 | { | 176 | { |
180 | InitMigrationsTable(); | 177 | InitMigrationsTable(); |
@@ -186,8 +183,8 @@ namespace OpenSim.Data | |||
186 | return; | 183 | return; |
187 | 184 | ||
188 | // to prevent people from killing long migrations. | 185 | // to prevent people from killing long migrations. |
189 | m_log.InfoFormat("[MIGRATIONS] Upgrading {0} to latest revision {1}.", _type, migrations.Keys[migrations.Count - 1]); | 186 | m_log.InfoFormat("[MIGRATIONS]: Upgrading {0} to latest revision {1}.", _type, migrations.Keys[migrations.Count - 1]); |
190 | m_log.Info("[MIGRATIONS] NOTE: this may take a while, don't interupt this process!"); | 187 | m_log.Info("[MIGRATIONS]: NOTE - this may take a while, don't interrupt this process!"); |
191 | 188 | ||
192 | foreach (KeyValuePair<int, string[]> kvp in migrations) | 189 | foreach (KeyValuePair<int, string[]> kvp in migrations) |
193 | { | 190 | { |
@@ -206,7 +203,7 @@ namespace OpenSim.Data | |||
206 | } | 203 | } |
207 | catch (Exception e) | 204 | catch (Exception e) |
208 | { | 205 | { |
209 | m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", e.Message.Replace("\n", " ")); | 206 | m_log.DebugFormat("[MIGRATIONS]: Cmd was {0}", e.Message.Replace("\n", " ")); |
210 | 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."); | 207 | 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."); |
211 | ExecuteScript("ROLLBACK;"); | 208 | ExecuteScript("ROLLBACK;"); |
212 | } | 209 | } |