* Refactor: Move enhancement of version string with operating system information from Scene to OpenSimMain

* This also means the operating system info will show up in the region console (and hence the logs)
This commit is contained in:
Justin Clarke Casey
2008-05-22 00:32:04 +00:00
parent 2e758172f0
commit 203017f554
3 changed files with 25 additions and 23 deletions

View File

@@ -346,12 +346,11 @@ namespace OpenSim
}
/// <summary>
/// Update the version string with extra information if it's available.
/// This currently means adding a subversion number if the root .svn/entries file is present.
/// Enhance the version string with extra information if it's available.
/// </summary>
protected void updateAvailableVersionInformation()
protected void enhanceVersionInformation()
{
// Set BuildVersion String for Show version command
// Add subversion revision information if available
string svnFileName = "../.svn/entries";
string inputLine;
int strcmp;
@@ -380,7 +379,25 @@ namespace OpenSim
if (!string.IsNullOrEmpty(buildVersion))
{
VersionInfo.Version += ", SVN build r" + buildVersion;
}
// Add operating system information if available
string OSString = "";
if (System.Environment.OSVersion.Platform != PlatformID.Unix)
{
OSString = System.Environment.OSVersion.ToString();
}
else
{
OSString = Util.ReadEtcIssue();
}
if (OSString.Length > 45)
{
OSString = OSString.Substring(0, 45);
}
VersionInfo.Version += " on " + OSString;
}
/// <summary>
@@ -388,7 +405,8 @@ namespace OpenSim
/// </summary>
protected void InternalStartUp()
{
updateAvailableVersionInformation();
enhanceVersionInformation();
m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n");
m_stats = StatsManager.StartCollectingSimExtraStats();