aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-05-19 04:17:56 +0100
committerMelanie2010-05-19 04:17:56 +0100
commite4b8d76b108725fa83dd1e1f3eb909b39482e769 (patch)
tree96f91570de23e1ebab189934bb1989fa466f5e22 /OpenSim
parentClean up output a bit (diff)
downloadopensim-SC_OLD-e4b8d76b108725fa83dd1e1f3eb909b39482e769.zip
opensim-SC_OLD-e4b8d76b108725fa83dd1e1f3eb909b39482e769.tar.gz
opensim-SC_OLD-e4b8d76b108725fa83dd1e1f3eb909b39482e769.tar.bz2
opensim-SC_OLD-e4b8d76b108725fa83dd1e1f3eb909b39482e769.tar.xz
Change appender to deal with line feeds more intelligently.
Change migration error reporting to not truncate the statement when reporting. It's a bit messier than the old error reporting, but at least one gets an idea of what could be wrong again. And things look a lot neater now.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/Migration.cs2
-rw-r--r--OpenSim/Framework/Console/OpenSimAppender.cs5
2 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs
index e54296d..6d4807f 100644
--- a/OpenSim/Data/Migration.cs
+++ b/OpenSim/Data/Migration.cs
@@ -206,7 +206,7 @@ namespace OpenSim.Data
206 } 206 }
207 catch (Exception e) 207 catch (Exception e)
208 { 208 {
209 m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", e.Message); 209 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."); 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.");
211 ExecuteScript("ROLLBACK;"); 211 ExecuteScript("ROLLBACK;");
212 } 212 }
diff --git a/OpenSim/Framework/Console/OpenSimAppender.cs b/OpenSim/Framework/Console/OpenSimAppender.cs
index 282ad38..72a251e 100644
--- a/OpenSim/Framework/Console/OpenSimAppender.cs
+++ b/OpenSim/Framework/Console/OpenSimAppender.cs
@@ -66,7 +66,10 @@ namespace OpenSim.Framework.Console
66 } 66 }
67 else 67 else
68 { 68 {
69 System.Console.WriteLine(loggingMessage); 69 if (!loggingMessage.EndsWith("\n"))
70 System.Console.WriteLine(loggingMessage);
71 else
72 System.Console.Write(loggingMessage);
70 } 73 }
71 } 74 }
72 catch (Exception e) 75 catch (Exception e)