diff options
author | Diva Canto | 2009-12-28 11:46:59 -0800 |
---|---|---|
committer | Diva Canto | 2009-12-28 11:46:59 -0800 |
commit | 19a7a8f797d0a1cb5b14c33c6cb6a66c085cc83a (patch) | |
tree | 1009b32279e546d46f474945af6c51599c7849d6 /OpenSim | |
parent | Added some more log messages. This is beginning to work. (diff) | |
parent | Make Migratons continue int he face of an error. This is required for the (diff) | |
download | opensim-SC_OLD-19a7a8f797d0a1cb5b14c33c6cb6a66c085cc83a.zip opensim-SC_OLD-19a7a8f797d0a1cb5b14c33c6cb6a66c085cc83a.tar.gz opensim-SC_OLD-19a7a8f797d0a1cb5b14c33c6cb6a66c085cc83a.tar.bz2 opensim-SC_OLD-19a7a8f797d0a1cb5b14c33c6cb6a66c085cc83a.tar.xz |
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/Migration.cs | 9 |
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 | { |