From c3f6c86c519d9934bfd1b9b0bf036381b10a87df Mon Sep 17 00:00:00 2001 From: onefang Date: Tue, 8 Sep 2020 21:20:28 +1000 Subject: Better ROBUST and sim startup console notification. --- .../Scripting/RegionReadyModule/RegionReadyModule.cs | 8 ++++++-- OpenSim/Server/Base/ServicesServerBase.cs | 1 + OpenSim/Server/ServerMain.cs | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs index fb059bd..988ada1 100755 --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs @@ -104,7 +104,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady if (m_disable_logins) { m_scene.LoginLock = true; - m_scene.EventManager.OnEmptyScriptCompileQueue += OnEmptyScriptCompileQueue; +//// m_scene.EventManager.OnEmptyScriptCompileQueue += OnEmptyScriptCompileQueue; // This should always show up to the user but should not trigger warn/errors as these messages are // expected and are not simulator problems. Ideally, there would be a status level in log4net but @@ -116,6 +116,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady RRAlert("disabled"); } } + m_scene.EventManager.OnEmptyScriptCompileQueue += OnEmptyScriptCompileQueue; } public void RemoveRegion(Scene scene) @@ -232,7 +233,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady // without info log messages enabled. Making this a warning is arguably misleading since it isn't a // warning, and monitor scripts looking for warn/error/fatal messages will received false positives. // Arguably, log4net needs a status log level (like Apache). - MainConsole.Instance.Output("INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", m_scene.Name); + if (m_disable_logins) + m_log.InfoFormat("[RegionReady]: INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", m_scene.Name); + else + m_log.InfoFormat("[RegionReady]: INITIALIZATION COMPLETE FOR {0}", m_scene.Name); } m_scene.SceneGridService.InformNeighborsThatRegionisUp( diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index 8c16f61..3d87097 100755 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs @@ -357,6 +357,7 @@ namespace OpenSim.Server.Base Uri configUri; IConfigSource s = null; + System.Console.WriteLine("[CONFIG]: Reading configuration file. {0}", Path.GetFullPath(iniFile)); try { if (Uri.TryCreate(iniFile, UriKind.Absolute, out configUri) && diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs index c180ca6..f1a7c97 100644 --- a/OpenSim/Server/ServerMain.cs +++ b/OpenSim/Server/ServerMain.cs @@ -190,6 +190,8 @@ namespace OpenSim.Server loader = new PluginLoader(m_Server.Config, registryLocation); + m_log.InfoFormat("[SERVER]: INITIALIZATION COMPLETE FOR ROBUST\n\n"); + int res = m_Server.Run(); if(m_Server != null) -- cgit v1.1