aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2009-07-31 21:00:09 +0000
committerMelanie Thielker2009-07-31 21:00:09 +0000
commitff35a3378edd4a1885cb41f44f91d546d6818139 (patch)
treec6a1463bd09554d793105847770bad36465c59be
parent* Fix a locking issue in the EventQueue (diff)
downloadopensim-SC_OLD-ff35a3378edd4a1885cb41f44f91d546d6818139.zip
opensim-SC_OLD-ff35a3378edd4a1885cb41f44f91d546d6818139.tar.gz
opensim-SC_OLD-ff35a3378edd4a1885cb41f44f91d546d6818139.tar.bz2
opensim-SC_OLD-ff35a3378edd4a1885cb41f44f91d546d6818139.tar.xz
Make ROBUST not hang on exit in recent Mono versions. Make the logfile config
setting/commandline option actually work.
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs10
-rw-r--r--OpenSim/Server/ServerMain.cs6
2 files changed, 12 insertions, 4 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 0c00c15..619c2d1 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -202,9 +202,13 @@ namespace OpenSim.Server.Base
202 if (fileAppender != null) 202 if (fileAppender != null)
203 { 203 {
204 if (startupConfig != null) 204 if (startupConfig != null)
205 fileAppender.File = startupConfig.GetString("logfile", 205 {
206 fileName + ".log"); 206
207 // assemblyName.Name + ".log"); 207 fileName = startupConfig.GetString("logfile", fileName+".log");
208 fileName = Path.GetFullPath(Path.Combine(".", fileName));
209 fileAppender.File = fileName;
210 fileAppender.ActivateOptions();
211 }
208 } 212 }
209 213
210 // Register the quit command 214 // Register the quit command
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 80b763c..77dfebb 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -87,7 +87,11 @@ namespace OpenSim.Server
87 m_log.InfoFormat("[SERVER]: Failed to load {0}", conn); 87 m_log.InfoFormat("[SERVER]: Failed to load {0}", conn);
88 } 88 }
89 } 89 }
90 return m_Server.Run(); 90 int res = m_Server.Run();
91
92 Environment.Exit(res);
93
94 return 0;
91 } 95 }
92 } 96 }
93} 97}