alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 00:55:13 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

consolidate os display name

Browse Source
This commit is contained in:
Luke Pulverenti
2014-11-23 18:10:41 -05:00
parent 1923de72bf
commit 2df4273ee0
13 changed files with 226 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
MediaBrowser.ServerApplication/MainStartup.cs
View File

@@ -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>

3
MediaBrowser.ServerApplication/Native/WindowsApp.cs
View File

@@ -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
};
}
}