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

Make ROBUST not hang on exit in recent Mono versions. Make the logfile config 

setting/commandline option actually work.
trunk
Melanie Thielker 2009-07-31 21:00:09 +00:00
parent ae8d3ab22e
commit ff35a3378e
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Server/Base/ServicesServerBase.cs
View File

@ -202,9 +202,13 @@ namespace OpenSim.Server.Base
if (fileAppender != null) if (fileAppender != null)
{ {
if (startupConfig != null) if (startupConfig != null)
fileAppender.File = startupConfig.GetString("logfile", {
fileName + ".log");
// assemblyName.Name + ".log"); fileName = startupConfig.GetString("logfile", fileName+".log");
fileName = Path.GetFullPath(Path.Combine(".", fileName));
fileAppender.File = fileName;
fileAppender.ActivateOptions();
}
} }
// Register the quit command // Register the quit command

6
OpenSim/Server/ServerMain.cs
View File

@ -87,7 +87,11 @@ namespace OpenSim.Server
m_log.InfoFormat("[SERVER]: Failed to load {0}", conn); m_log.InfoFormat("[SERVER]: Failed to load {0}", conn);
} }
} }
return m_Server.Run(); int res = m_Server.Run();
Environment.Exit(res);
return 0;
} }
} }
} }