aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-09-18 03:37:10 +0100
committerJustin Clark-Casey (justincc)2010-09-18 03:37:10 +0100
commita22f007246598a7f81eafa254a200c21886ce648 (patch)
treec1e7614f203646751114f556dcc30f32011c4338 /OpenSim
parentClarify help text for use of file paths with console command "create region". (diff)
downloadopensim-SC-a22f007246598a7f81eafa254a200c21886ce648.zip
opensim-SC-a22f007246598a7f81eafa254a200c21886ce648.tar.gz
opensim-SC-a22f007246598a7f81eafa254a200c21886ce648.tar.bz2
opensim-SC-a22f007246598a7f81eafa254a200c21886ce648.tar.xz
Improve the explanative text of migration failures
When running for the first time, people see migration failures because of sql statements that are trying to move data from old tables (e.g. users). The amended text attempts to calm their nerves.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/Migration.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index fc9a142..2895a71 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -138,12 +138,12 @@ namespace OpenSim.Data
138 /// <param name="conn"></param> 138 /// <param name="conn"></param>
139 /// <param name="script">Array of strings, one-per-batch (often just one)</param> 139 /// <param name="script">Array of strings, one-per-batch (often just one)</param>
140 protected virtual void ExecuteScript(DbConnection conn, string[] script) 140 protected virtual void ExecuteScript(DbConnection conn, string[] script)
141 { 141 {
142 using (DbCommand cmd = conn.CreateCommand()) 142 using (DbCommand cmd = conn.CreateCommand())
143 { 143 {
144 cmd.CommandTimeout = 0; 144 cmd.CommandTimeout = 0;
145 foreach (string sql in script) 145 foreach (string sql in script)
146 { 146 {
147 cmd.CommandText = sql; 147 cmd.CommandText = sql;
148 try 148 try
149 { 149 {
@@ -204,7 +204,7 @@ namespace OpenSim.Data
204 catch (Exception e) 204 catch (Exception e)
205 { 205 {
206 m_log.DebugFormat("[MIGRATIONS]: Cmd was {0}", e.Message.Replace("\n", " ")); 206 m_log.DebugFormat("[MIGRATIONS]: Cmd was {0}", e.Message.Replace("\n", " "));
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."); 207 m_log.Debug("[MIGRATIONS]: An error has occurred in the migration. If you're running OpenSim for the first time then you can probably safely ignore this, since certain migration commands attempt to fetch data out of old tables. However, if you're using an existing database and you see database related errors while running OpenSim then you will need to fix these problems manually. Continuing.");
208 ExecuteScript("ROLLBACK;"); 208 ExecuteScript("ROLLBACK;");
209 } 209 }
210 210