mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 11:34:57 +02:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts: MediaBrowser.ServerApplication/MainStartup.cs
This commit is contained in:
commit
bb13921b82
1 changed files with 9 additions and 2 deletions
|
@ -194,7 +194,13 @@ namespace MediaBrowser.ServerApplication
|
||||||
private static void BeginLog(ILogger logger, IApplicationPaths appPaths)
|
private static void BeginLog(ILogger logger, IApplicationPaths appPaths)
|
||||||
{
|
{
|
||||||
logger.Info("Media Browser Server started");
|
logger.Info("Media Browser Server started");
|
||||||
ApplicationHost.LogEnvironmentInfo(logger, appPaths);
|
logger.Info("Command line: {0}", string.Join(" ", Environment.GetCommandLineArgs()));
|
||||||
|
|
||||||
|
logger.Info("Server: {0}", Environment.MachineName);
|
||||||
|
logger.Info("Operating system: {0}", Environment.OSVersion.ToString());
|
||||||
|
logger.Info("Program data path: {0}", appPaths.ProgramDataPath);
|
||||||
|
|
||||||
|
logger.Info("Application Path: {0}", appPaths.ApplicationPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static readonly TaskCompletionSource<bool> ApplicationTaskCompletionSource = new TaskCompletionSource<bool>();
|
private static readonly TaskCompletionSource<bool> ApplicationTaskCompletionSource = new TaskCompletionSource<bool>();
|
||||||
|
@ -220,6 +226,7 @@ namespace MediaBrowser.ServerApplication
|
||||||
ErrorModes.SEM_NOGPFAULTERRORBOX | ErrorModes.SEM_NOOPENFILEERRORBOX);
|
ErrorModes.SEM_NOGPFAULTERRORBOX | ErrorModes.SEM_NOOPENFILEERRORBOX);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
var task = _appHost.Init(initProgress);
|
var task = _appHost.Init(initProgress);
|
||||||
task = task.ContinueWith(new Action<Task>(a => _appHost.RunStartupTasks()));
|
task = task.ContinueWith(new Action<Task>(a => _appHost.RunStartupTasks()));
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue