diff --git a/NzbDrone.Backbone/AddSeries/Existing/RootFolderCompositeViewTemplate.html b/NzbDrone.Backbone/AddSeries/Existing/RootFolderCompositeViewTemplate.html index 580fa0905..f0a45171c 100644 --- a/NzbDrone.Backbone/AddSeries/Existing/RootFolderCompositeViewTemplate.html +++ b/NzbDrone.Backbone/AddSeries/Existing/RootFolderCompositeViewTemplate.html @@ -1,4 +1,4 @@ -
+

{{path}}

diff --git a/NzbDrone.Backbone/AddSeries/Existing/UnmappedFolderCompositeViewTemplatate.html b/NzbDrone.Backbone/AddSeries/Existing/UnmappedFolderCompositeViewTemplatate.html index 15936d413..102c6cd63 100644 --- a/NzbDrone.Backbone/AddSeries/Existing/UnmappedFolderCompositeViewTemplatate.html +++ b/NzbDrone.Backbone/AddSeries/Existing/UnmappedFolderCompositeViewTemplatate.html @@ -1,5 +1,5 @@ 
-
+
+
-
+
diff --git a/NzbDrone.Backbone/AddSeries/addSeries.css b/NzbDrone.Backbone/AddSeries/addSeries.css index 606e98cbc..1dd516464 100644 --- a/NzbDrone.Backbone/AddSeries/addSeries.css +++ b/NzbDrone.Backbone/AddSeries/addSeries.css @@ -13,7 +13,6 @@ width: 40px; padding-top: 14px; padding-left: 10px; - margin-left: 30px; } .result-list { diff --git a/NzbDrone.Backbone/AddSeries/addSeriesLayoutTemplate.html b/NzbDrone.Backbone/AddSeries/addSeriesLayoutTemplate.html index da973c799..77fac851a 100644 --- a/NzbDrone.Backbone/AddSeries/addSeriesLayoutTemplate.html +++ b/NzbDrone.Backbone/AddSeries/addSeriesLayoutTemplate.html @@ -6,7 +6,7 @@
  • Import Existing Series
  • TV Folders
  • -
    +
    Add new series.
    Import existing.
    Manage root folders
    diff --git a/NzbDrone/Providers/MonitoringProvider.cs b/NzbDrone/Providers/MonitoringProvider.cs index e7e06a5da..1a6a8e03e 100644 --- a/NzbDrone/Providers/MonitoringProvider.cs +++ b/NzbDrone/Providers/MonitoringProvider.cs @@ -1,7 +1,5 @@ using System; using System.Diagnostics; -using System.Net; -using System.Runtime.Remoting; using System.Threading; using NLog; using NzbDrone.Common; @@ -12,40 +10,23 @@ namespace NzbDrone.Providers { private static readonly Logger logger = LogManager.GetLogger("Host.MonitoringProvider"); - private readonly IHostController _hostController; private readonly ProcessProvider _processProvider; - private readonly HttpProvider _httpProvider; - private readonly ConfigFileProvider _configFileProvider; - private int _pingFailCounter; - private Timer _pingTimer; private Timer _processPriorityCheckTimer; - public MonitoringProvider(ProcessProvider processProvider, IHostController hostController, - HttpProvider httpProvider, ConfigFileProvider configFileProvider) + public MonitoringProvider(ProcessProvider processProvider) { _processProvider = processProvider; - _hostController = hostController; - _httpProvider = httpProvider; - _configFileProvider = configFileProvider; - } - - public MonitoringProvider() - { } public void Start() { AppDomain.CurrentDomain.UnhandledException += ((s, e) => AppDomainException(e.ExceptionObject as Exception)); - AppDomain.CurrentDomain.ProcessExit += ProgramExited; - AppDomain.CurrentDomain.DomainUnload += ProgramExited; _processPriorityCheckTimer = new Timer(EnsurePriority); _processPriorityCheckTimer.Change(TimeSpan.FromSeconds(15), TimeSpan.FromMinutes(30)); - _pingTimer = new Timer(PingServer); - _pingTimer.Change(TimeSpan.FromSeconds(5), TimeSpan.FromMinutes(1)); } public virtual void EnsurePriority(object sender) @@ -71,50 +52,9 @@ namespace NzbDrone.Providers } } - public virtual void PingServer(object sender) - { - if (!_hostController.ServerStarted) return; - - try - { - ICredentials identity = CredentialCache.DefaultCredentials; - _httpProvider.DownloadString(_hostController.AppUrl, identity); //This should preload the home page, making the first load faster. - string response = _httpProvider.DownloadString(_hostController.AppUrl + "/health", identity); - - if (!response.Contains("OK")) - { - throw new ServerException("Health services responded with an invalid response."); - } - - if (_pingFailCounter > 0) - { - logger.Info("Application pool has been successfully recovered."); - } - - _pingFailCounter = 0; - } - catch (Exception ex) - { - _pingFailCounter++; - logger.Error("Application pool is not responding. Count: {0} - {1}", _pingFailCounter, ex.Message); - if (_pingFailCounter >= 10) - { - _pingFailCounter = 0; - _hostController.RestartServer(); - } - } - } - - private void ProgramExited(object sender, EventArgs e) - { - _hostController.StopServer(); - } - public static void AppDomainException(Exception excepion) { Console.WriteLine("EPIC FAIL: {0}", excepion); - - logger.FatalException("EPIC FAIL: " + excepion.Message, excepion); } }