diff options
author | Melanie | 2010-05-19 03:48:03 +0100 |
---|---|---|
committer | Melanie | 2010-05-19 03:48:03 +0100 |
commit | 0c209a469b54a52ac7d54a7bddd2bdcf02a80522 (patch) | |
tree | e754e42ce0b602794e4f5dcf42ee56215f0d6f12 /OpenSim/Data/Migration.cs | |
parent | Fix the migration message to say "Continuing" again. Remove line feed, which (diff) | |
download | opensim-SC-0c209a469b54a52ac7d54a7bddd2bdcf02a80522.zip opensim-SC-0c209a469b54a52ac7d54a7bddd2bdcf02a80522.tar.gz opensim-SC-0c209a469b54a52ac7d54a7bddd2bdcf02a80522.tar.bz2 opensim-SC-0c209a469b54a52ac7d54a7bddd2bdcf02a80522.tar.xz |
Clean up output a bit
Diffstat (limited to 'OpenSim/Data/Migration.cs')
-rw-r--r-- | OpenSim/Data/Migration.cs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs index 987eab5..e54296d 100644 --- a/OpenSim/Data/Migration.cs +++ b/OpenSim/Data/Migration.cs | |||
@@ -146,7 +146,14 @@ namespace OpenSim.Data | |||
146 | foreach (string sql in script) | 146 | foreach (string sql in script) |
147 | { | 147 | { |
148 | cmd.CommandText = sql; | 148 | cmd.CommandText = sql; |
149 | cmd.ExecuteNonQuery(); | 149 | try |
150 | { | ||
151 | cmd.ExecuteNonQuery(); | ||
152 | } | ||
153 | catch | ||
154 | { | ||
155 | throw new Exception(sql); | ||
156 | } | ||
150 | } | 157 | } |
151 | } | 158 | } |
152 | } | 159 | } |
@@ -199,8 +206,8 @@ namespace OpenSim.Data | |||
199 | } | 206 | } |
200 | catch (Exception e) | 207 | catch (Exception e) |
201 | { | 208 | { |
202 | m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", kvp.Value.ToString()); | 209 | m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", e.Message); |
203 | m_log.DebugFormat("[MIGRATIONS]: An error has occurred in the migration {0}. 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.", e.Message); | 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."); |
204 | ExecuteScript("ROLLBACK;"); | 211 | ExecuteScript("ROLLBACK;"); |
205 | } | 212 | } |
206 | 213 | ||