Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 32 insertions, 42 deletions

diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index ecd69b0..1f2c54d 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -34,6 +34,7 @@ using System.Text;
 using System.Xml;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Framework.Servers;
 using log4net;
 using log4net.Config;
@@ -48,9 +49,7 @@ namespace OpenSim.Server.Base
     {
         // Logger
         //
-        private static readonly ILog m_log =
-                LogManager.GetLogger(
-                MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         // Command line args
         //
@@ -71,11 +70,9 @@ namespace OpenSim.Server.Base
         public ServicesServerBase(string prompt, string[] args) : base()
         {
             // Save raw arguments
-            //
             m_Arguments = args;
 
             // Read command line
-            //
             ArgvConfigSource argvConfig = new ArgvConfigSource(args);
 
             argvConfig.AddSwitch("Startup", "console", "c");
@@ -85,8 +82,9 @@ namespace OpenSim.Server.Base
             argvConfig.AddSwitch("Startup", "logconfig", "g");
 
             // Automagically create the ini file name
-            //
-            string fileName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location);
+            string fileName = "";
+            if (Assembly.GetEntryAssembly() != null)
+                fileName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location);
             string iniFile = fileName + ".ini";
             string logConfig = null;
 
@@ -94,19 +92,17 @@ namespace OpenSim.Server.Base
             if (startupConfig != null)
             {
                 // Check if a file name was given on the command line
-                //
                 iniFile = startupConfig.GetString("inifile", iniFile);
-                //
+
                 // Check if a prompt was given on the command line
                 prompt = startupConfig.GetString("prompt", prompt);
-                //
+                
                 // Check for a Log4Net config file on the command line
-                logConfig =startupConfig.GetString("logconfig",logConfig);
+                logConfig =startupConfig.GetString("logconfig", logConfig);
             }
 
-            // Find out of the file name is a URI and remote load it
-            // if it's possible. Load it as a local file otherwise.
-            //
+            // Find out of the file name is a URI and remote load it if possible.
+            // Load it as a local file otherwise.
             Uri configUri;
 
             try
@@ -128,13 +124,16 @@ namespace OpenSim.Server.Base
                 Environment.Exit(1);
             }
 
-            // Merge the configuration from the command line into the
-            // loaded file
-            //
+            // Merge OpSys env vars
+            m_log.Info("[CONFIG]: Loading environment variables for Config");
+            Util.MergeEnvironmentToConfig(Config);
+            
+            // Merge the configuration from the command line into the loaded file
             Config.Merge(argvConfig);
 
+            Config.ReplaceKeyValues();
+
             // Refresh the startupConfig post merge
-            //
             if (Config.Configs["Startup"] != null)
             {
                 startupConfig = Config.Configs["Startup"];
@@ -144,13 +143,10 @@ namespace OpenSim.Server.Base
 
             prompt = startupConfig.GetString("Prompt", prompt);
 
-            // Allow derived classes to load config before the console is
-            // opened.
-            //
+            // Allow derived classes to load config before the console is opened.
             ReadConfig();
 
             // Create main console
-            //
             string consoleType = "local";
             if (startupConfig != null)
                 consoleType = startupConfig.GetString("console", consoleType);
@@ -164,18 +160,17 @@ namespace OpenSim.Server.Base
                 MainConsole.Instance = new RemoteConsole(prompt);
                 ((RemoteConsole)MainConsole.Instance).ReadConfig(Config);
             }
-            else
+            else if (consoleType == "mock")
+            {
+                MainConsole.Instance = new MockConsole();
+            }
+            else if (consoleType == "local")
             {
-                MainConsole.Instance = new LocalConsole(prompt);
+                MainConsole.Instance = new LocalConsole(prompt, startupConfig);
             }
 
             m_console = MainConsole.Instance;
 
-            // Configure the appenders for log4net
-            //
-            OpenSimAppender consoleAppender = null;
-            FileAppender fileAppender = null;
-
             if (logConfig != null)
             {
                 FileInfo cfg = new FileInfo(logConfig);
@@ -186,6 +181,7 @@ namespace OpenSim.Server.Base
                 XmlConfigurator.Configure();
             }
 
+            LogEnvironmentInformation();
             RegisterCommonAppenders(startupConfig);
 
             if (startupConfig.GetString("PIDFile", String.Empty) != String.Empty)
@@ -194,20 +190,10 @@ namespace OpenSim.Server.Base
             }
 
             RegisterCommonCommands();
-
-            // Register the quit command
-            //
-            MainConsole.Instance.Commands.AddCommand("General", false, "quit",
-                    "quit",
-                    "Quit the application", HandleQuit);
-
-            MainConsole.Instance.Commands.AddCommand("General", false, "shutdown",
-                    "shutdown",
-                    "Quit the application", HandleQuit);
+            RegisterCommonComponents(Config);
 
             // Allow derived classes to perform initialization that
             // needs to be done after the console has opened
-            //
             Initialise();
         }
 
@@ -218,6 +204,9 @@ namespace OpenSim.Server.Base
 
         public virtual int Run()
         {
+            Watchdog.Enabled = true;
+            MemoryWatchdog.Enabled = true;
+
             while (m_Running)
             {
                 try
@@ -235,11 +224,12 @@ namespace OpenSim.Server.Base
             return 0;
         }
 
-        protected virtual void HandleQuit(string module, string[] args)
+        protected override void ShutdownSpecific()
         {
             m_Running = false;
             m_log.Info("[CONSOLE] Quitting");
 
+            base.ShutdownSpecific();
         }
 
         protected virtual void ReadConfig()
@@ -250,4 +240,4 @@ namespace OpenSim.Server.Base
         {
         }
     }
-}
+}
\ No newline at end of file