From 728f5538027cc38d25f98bc971466a1e53828237 Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Thu, 31 Aug 2017 22:43:01 -0700
Subject: [PATCH] Log when running tray app

---
 src/NzbDrone.Common/EnvironmentInfo/IRuntimeInfo.cs | 5 ++---
 src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs  | 6 +++++-
 src/NzbDrone.Host/Router.cs                         | 6 +++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/NzbDrone.Common/EnvironmentInfo/IRuntimeInfo.cs b/src/NzbDrone.Common/EnvironmentInfo/IRuntimeInfo.cs
index cb432addc..d387001ef 100644
--- a/src/NzbDrone.Common/EnvironmentInfo/IRuntimeInfo.cs
+++ b/src/NzbDrone.Common/EnvironmentInfo/IRuntimeInfo.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace NzbDrone.Common.EnvironmentInfo
 {
     public interface IRuntimeInfo
@@ -7,8 +5,9 @@ namespace NzbDrone.Common.EnvironmentInfo
         bool IsUserInteractive { get; }
         bool IsAdmin { get; }
         bool IsWindowsService { get; }
+        bool IsWindowsTray { get; }
         bool IsExiting { get; set; }
         bool RestartPending { get; set; }
         string ExecutingApplication { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs
index a53862311..3337b99b8 100644
--- a/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs
+++ b/src/NzbDrone.Common/EnvironmentInfo/RuntimeInfo.cs
@@ -1,10 +1,11 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Security.Principal;
 using System.ServiceProcess;
 using NLog;
+using NzbDrone.Common.Processes;
 
 namespace NzbDrone.Common.EnvironmentInfo
 {
@@ -27,6 +28,7 @@ namespace NzbDrone.Common.EnvironmentInfo
             if (entry != null)
             {
                 ExecutingApplication = entry.Location;
+                IsWindowsTray = entry.ManifestModule.Name == $"{ProcessProvider.NZB_DRONE_PROCESS_NAME}.exe";
             }
         }
 
@@ -102,5 +104,7 @@ namespace NzbDrone.Common.EnvironmentInfo
 
             return true;
         }
+
+        public bool IsWindowsTray { get; private set; }
     }
 }
diff --git a/src/NzbDrone.Host/Router.cs b/src/NzbDrone.Host/Router.cs
index efd9e4627..354bca3aa 100644
--- a/src/NzbDrone.Host/Router.cs
+++ b/src/NzbDrone.Host/Router.cs
@@ -1,6 +1,7 @@
 using NLog;
 using NzbDrone.Common;
 using NzbDrone.Common.Composition;
+using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Core.Datastore;
 
 namespace NzbDrone.Host
@@ -10,18 +11,21 @@ namespace NzbDrone.Host
         private readonly INzbDroneServiceFactory _nzbDroneServiceFactory;
         private readonly IServiceProvider _serviceProvider;
         private readonly IConsoleService _consoleService;
+        private readonly IRuntimeInfo _runtimeInfo;
         private readonly IContainer _container;
         private readonly Logger _logger;
 
         public Router(INzbDroneServiceFactory nzbDroneServiceFactory,
                       IServiceProvider serviceProvider,
                       IConsoleService consoleService,
+                      IRuntimeInfo runtimeInfo,
                       IContainer container,
                       Logger logger)
         {
             _nzbDroneServiceFactory = nzbDroneServiceFactory;
             _serviceProvider = serviceProvider;
             _consoleService = consoleService;
+            _runtimeInfo = runtimeInfo;
             _container = container;
             _logger = logger;
         }
@@ -44,7 +48,7 @@ namespace NzbDrone.Host
                      
                 case ApplicationModes.Interactive:
                     {
-                        _logger.Debug("Console selected");
+                        _logger.Debug(_runtimeInfo.IsWindowsTray ? "Tray selected" : "Console selected");
 
                         DbFactory.RegisterDatabase(_container);
                         _nzbDroneServiceFactory.Start();