Log same environment information to Robust log as is already done for simulator logs, for debug purposes
parent
3098ad4ab9
commit
2a81f4db2e
|
@ -133,17 +133,7 @@ namespace OpenSim.Framework.Servers
|
||||||
/// Performs initialisation of the scene, such as loading configuration from disk.
|
/// Performs initialisation of the scene, such as loading configuration from disk.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public virtual void Startup()
|
public virtual void Startup()
|
||||||
{
|
{
|
||||||
m_log.Info("[STARTUP]: Beginning startup processing");
|
|
||||||
|
|
||||||
m_log.Info("[STARTUP]: OpenSimulator version: " + m_version + Environment.NewLine);
|
|
||||||
// clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and
|
|
||||||
// the clr version number doesn't match the project version number under Mono.
|
|
||||||
//m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine);
|
|
||||||
m_log.InfoFormat(
|
|
||||||
"[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n",
|
|
||||||
Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32");
|
|
||||||
|
|
||||||
StartupSpecific();
|
StartupSpecific();
|
||||||
|
|
||||||
TimeSpan timeTaken = DateTime.Now - m_startuptime;
|
TimeSpan timeTaken = DateTime.Now - m_startuptime;
|
||||||
|
|
|
@ -113,6 +113,26 @@ namespace OpenSim.Framework.Servers
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Log information about the circumstances in which we're running (OpenSimulator version number, CLR details,
|
||||||
|
/// etc.).
|
||||||
|
/// </summary>
|
||||||
|
public void LogEnvironmentInformation()
|
||||||
|
{
|
||||||
|
// FIXME: This should be done down in ServerBase but we need to sort out and refactor the log4net
|
||||||
|
// XmlConfigurator calls first accross servers.
|
||||||
|
m_log.InfoFormat("[SERVER BASE]: Starting in {0}", m_startupDirectory);
|
||||||
|
|
||||||
|
m_log.InfoFormat("[SERVER BASE]: OpenSimulator version: {0}", m_version);
|
||||||
|
|
||||||
|
// clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and
|
||||||
|
// the clr version number doesn't match the project version number under Mono.
|
||||||
|
//m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine);
|
||||||
|
m_log.InfoFormat(
|
||||||
|
"[SERVER BASE]: Operating system version: {0}, .NET platform {1}, {2}-bit",
|
||||||
|
Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32");
|
||||||
|
}
|
||||||
|
|
||||||
public void RegisterCommonAppenders(IConfig startupConfig)
|
public void RegisterCommonAppenders(IConfig startupConfig)
|
||||||
{
|
{
|
||||||
ILoggerRepository repository = LogManager.GetRepository();
|
ILoggerRepository repository = LogManager.GetRepository();
|
||||||
|
|
|
@ -159,6 +159,7 @@ namespace OpenSim
|
||||||
|
|
||||||
MainConsole.Instance = m_console;
|
MainConsole.Instance = m_console;
|
||||||
|
|
||||||
|
LogEnvironmentInformation();
|
||||||
RegisterCommonAppenders(Config.Configs["Startup"]);
|
RegisterCommonAppenders(Config.Configs["Startup"]);
|
||||||
RegisterConsoleCommands();
|
RegisterConsoleCommands();
|
||||||
|
|
||||||
|
|
|
@ -142,10 +142,6 @@ namespace OpenSim
|
||||||
/// <param name="configSource"></param>
|
/// <param name="configSource"></param>
|
||||||
public OpenSimBase(IConfigSource configSource) : base()
|
public OpenSimBase(IConfigSource configSource) : base()
|
||||||
{
|
{
|
||||||
// FIXME: This should be done down in ServerBase but we need to sort out and refactor the log4net
|
|
||||||
// XmlConfigurator calls first accross servers.
|
|
||||||
m_log.InfoFormat("[SERVER BASE]: Starting in {0}", m_startupDirectory);
|
|
||||||
|
|
||||||
LoadConfigSettings(configSource);
|
LoadConfigSettings(configSource);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -178,10 +178,7 @@ namespace OpenSim.Server.Base
|
||||||
XmlConfigurator.Configure();
|
XmlConfigurator.Configure();
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME: This should be done down in ServerBase but we need to sort out and refactor the log4net
|
LogEnvironmentInformation();
|
||||||
// XmlConfigurator calls first accross servers.
|
|
||||||
m_log.InfoFormat("[SERVER BASE]: Starting in {0}", m_startupDirectory);
|
|
||||||
|
|
||||||
RegisterCommonAppenders(startupConfig);
|
RegisterCommonAppenders(startupConfig);
|
||||||
|
|
||||||
if (startupConfig.GetString("PIDFile", String.Empty) != String.Empty)
|
if (startupConfig.GetString("PIDFile", String.Empty) != String.Empty)
|
||||||
|
|
Loading…
Reference in New Issue