update startup logging

This commit is contained in:
Luke Pulverenti 2014-07-21 21:31:53 -04:00
parent c524f3919e
commit 1ddbdd8943

View file

@ -193,7 +193,7 @@ namespace MediaBrowser.ServerApplication
/// <param name="appPaths">The app paths.</param> /// <param name="appPaths">The app paths.</param>
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); ApplicationHost.LogEnvironmentInfo(logger, appPaths);
} }
@ -221,13 +221,7 @@ namespace MediaBrowser.ServerApplication
} }
var task = _appHost.Init(initProgress); var task = _appHost.Init(initProgress);
Task.WaitAll(task); task = task.ContinueWith(new Action<Task>(a => _appHost.RunStartupTasks()));
task = _appHost.RunStartupTasks();
Task.WaitAll(task);
SystemEvents.SessionEnding += SystemEvents_SessionEnding;
SystemEvents.SessionSwitch += SystemEvents_SessionSwitch;
if (runService) if (runService)
{ {
@ -235,6 +229,11 @@ namespace MediaBrowser.ServerApplication
} }
else else
{ {
Task.WaitAll(task);
SystemEvents.SessionEnding += SystemEvents_SessionEnding;
SystemEvents.SessionSwitch += SystemEvents_SessionSwitch;
HideSplashScreen(); HideSplashScreen();
ShowTrayIcon(); ShowTrayIcon();