From ff35a3378edd4a1885cb41f44f91d546d6818139 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 31 Jul 2009 21:00:09 +0000
Subject: Make ROBUST not hang on exit in recent Mono versions. Make the
 logfile config setting/commandline option actually work.

---
 OpenSim/Server/Base/ServicesServerBase.cs | 10 +++++++---
 OpenSim/Server/ServerMain.cs              |  6 +++++-
 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
             if (fileAppender != 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
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
                     m_log.InfoFormat("[SERVER]: Failed to load {0}", conn);
                 }
             }
-            return m_Server.Run();
+            int res = m_Server.Run();
+
+            Environment.Exit(res);
+
+            return 0;
         }
     }
 }
-- 
cgit v1.1