OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
soprefactor
Melanie 2010-05-19 04:17:56 +01:00
parent 0c209a469b
commit e4b8d76b10
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Data/Migration.cs
View File

@ -206,7 +206,7 @@ namespace OpenSim.Data
} }
catch (Exception e) catch (Exception e)
{ {
m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", e.Message); m_log.DebugFormat("[MIGRATIONS] Cmd was {0}", e.Message.Replace("\n", " "));
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."); 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.");
ExecuteScript("ROLLBACK;"); ExecuteScript("ROLLBACK;");
} }

5
OpenSim/Framework/Console/OpenSimAppender.cs
View File

@ -66,7 +66,10 @@ namespace OpenSim.Framework.Console
} }
else else
{ {
System.Console.WriteLine(loggingMessage); if (!loggingMessage.EndsWith("\n"))
System.Console.WriteLine(loggingMessage);
else
System.Console.Write(loggingMessage);
} }
} }
catch (Exception e) catch (Exception e)