aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-05-19 03:48:03 +0100
committerMelanie2010-05-19 03:48:03 +0100
commit0c209a469b54a52ac7d54a7bddd2bdcf02a80522 (patch)
treee754e42ce0b602794e4f5dcf42ee56215f0d6f12 /OpenSim
parentFix the migration message to say "Continuing" again. Remove line feed, which (diff)
downloadopensim-SC_OLD-0c209a469b54a52ac7d54a7bddd2bdcf02a80522.zip
opensim-SC_OLD-0c209a469b54a52ac7d54a7bddd2bdcf02a80522.tar.gz
opensim-SC_OLD-0c209a469b54a52ac7d54a7bddd2bdcf02a80522.tar.bz2
opensim-SC_OLD-0c209a469b54a52ac7d54a7bddd2bdcf02a80522.tar.xz
Clean up output a bit
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/Migration.cs13
-rw-r--r--OpenSim/Data/MySQL/MySQLMigrations.cs6
-rw-r--r--OpenSim/Framework/Console/OpenSimAppender.cs2
3 files changed, 12 insertions, 9 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
diff --git a/OpenSim/Data/MySQL/MySQLMigrations.cs b/OpenSim/Data/MySQL/MySQLMigrations.cs
index 959b5d0..81a0e83 100644
--- a/OpenSim/Data/MySQL/MySQLMigrations.cs
+++ b/OpenSim/Data/MySQL/MySQLMigrations.cs
@@ -43,8 +43,6 @@ namespace OpenSim.Data.MySQL
43 /// </summary> 43 /// </summary>
44 public class MySqlMigration : Migration 44 public class MySqlMigration : Migration
45 { 45 {
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47
48 public MySqlMigration() 46 public MySqlMigration()
49 : base() 47 : base()
50 { 48 {
@@ -75,9 +73,7 @@ namespace OpenSim.Data.MySQL
75 scr.Query = sql; 73 scr.Query = sql;
76 scr.Error += delegate(object sender, MySqlScriptErrorEventArgs args) 74 scr.Error += delegate(object sender, MySqlScriptErrorEventArgs args)
77 { 75 {
78 m_log.ErrorFormat("[MySQL MIGRATION]: Error {0}", args.Exception.Message); 76 throw new Exception(sql);
79 m_log.ErrorFormat("[MySQL MIGRATION]: In SQL: {0}", args.StatementText);
80 throw args.Exception;
81 }; 77 };
82 scr.Execute(); 78 scr.Execute();
83 } 79 }
diff --git a/OpenSim/Framework/Console/OpenSimAppender.cs b/OpenSim/Framework/Console/OpenSimAppender.cs
index cd95506..282ad38 100644
--- a/OpenSim/Framework/Console/OpenSimAppender.cs
+++ b/OpenSim/Framework/Console/OpenSimAppender.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Framework.Console
66 } 66 }
67 else 67 else
68 { 68 {
69 System.Console.Write(loggingMessage); 69 System.Console.WriteLine(loggingMessage);
70 } 70 }
71 } 71 }
72 catch (Exception e) 72 catch (Exception e)