diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-11-23 18:10:41 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-11-23 18:10:41 -0500 |
| commit | 2df4273ee08425858f93cf86092df45a5a6deecc (patch) | |
| tree | daa20b4be88311cd070a6293ebc322ee141432e2 /MediaBrowser.ServerApplication | |
| parent | 1923de72bf3c502ba9b942ef6caa5f73a33f43d6 (diff) | |
consolidate os display name
Diffstat (limited to 'MediaBrowser.ServerApplication')
| -rw-r--r-- | MediaBrowser.ServerApplication/MainStartup.cs | 12 | ||||
| -rw-r--r-- | MediaBrowser.ServerApplication/Native/WindowsApp.cs | 3 |
2 files changed, 3 insertions, 12 deletions
diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs index 8974ca8da..e1c481d22 100644 --- a/MediaBrowser.ServerApplication/MainStartup.cs +++ b/MediaBrowser.ServerApplication/MainStartup.cs @@ -49,7 +49,7 @@ namespace MediaBrowser.ServerApplication var logger = _logger = logManager.GetLogger("Main"); - BeginLog(logger, appPaths); + ApplicationHost.LogEnvironmentInfo(logger, appPaths, true); // Install directly if (options.ContainsOption("-installservice")) @@ -188,16 +188,6 @@ namespace MediaBrowser.ServerApplication } } - /// <summary> - /// Begins the log. - /// </summary> - /// <param name="logger">The logger.</param> - /// <param name="appPaths">The app paths.</param> - private static void BeginLog(ILogger logger, IApplicationPaths appPaths) - { - ApplicationHost.LogEnvironmentInfo(logger, appPaths, true); - } - private static readonly TaskCompletionSource<bool> ApplicationTaskCompletionSource = new TaskCompletionSource<bool>(); /// <summary> diff --git a/MediaBrowser.ServerApplication/Native/WindowsApp.cs b/MediaBrowser.ServerApplication/Native/WindowsApp.cs index a4d0f74ab..9a37c268c 100644 --- a/MediaBrowser.ServerApplication/Native/WindowsApp.cs +++ b/MediaBrowser.ServerApplication/Native/WindowsApp.cs @@ -33,7 +33,8 @@ namespace MediaBrowser.ServerApplication.Native return new NativeEnvironment { OperatingSystem = OperatingSystem.Windows, - SystemArchitecture = System.Environment.Is64BitOperatingSystem ? Architecture.X86_X64 : Architecture.X86 + SystemArchitecture = System.Environment.Is64BitOperatingSystem ? Architecture.X86_X64 : Architecture.X86, + OperatingSystemVersionString = System.Environment.OSVersion.VersionString }; } } |
