mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Cleaned up some error messages

This commit is contained in:
Mark McDowall 2013-01-02 21:11:39 -08:00
parent 120758bf02
commit be2a5ea754
4 changed files with 20 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
NzbDrone.Common/IISProvider.cs
View File

@ -13,23 +13,6 @@ namespace NzbDrone.Common
private readonly ProcessProvider _processProvider; private readonly ProcessProvider _processProvider;
private readonly EnvironmentProvider _environmentProvider; private readonly EnvironmentProvider _environmentProvider;
public IISProvider(ConfigFileProvider configFileProvider, ProcessProvider processProvider, EnvironmentProvider environmentProvider)
{
_configFileProvider = configFileProvider;
_processProvider = processProvider;
_environmentProvider = environmentProvider;
}
public IISProvider()
{
}
public string AppUrl
{
get { return string.Format("http://localhost:{0}/", _configFileProvider.Port); }
}
public int IISProcessId { get; private set; } public int IISProcessId { get; private set; }
public bool ServerStarted { get; private set; } public bool ServerStarted { get; private set; }
@ -74,6 +57,22 @@ namespace NzbDrone.Common
ServerStarted = true; ServerStarted = true;
} }
public IISProvider(ConfigFileProvider configFileProvider, ProcessProvider processProvider, EnvironmentProvider environmentProvider)
{
_configFileProvider = configFileProvider;
_processProvider = processProvider;
_environmentProvider = environmentProvider;
}
public IISProvider()
{
}
public string AppUrl
{
get { return string.Format("http://localhost:{0}/", _configFileProvider.Port); }
}
private static void OnErrorDataReceived(object sender, DataReceivedEventArgs e) private static void OnErrorDataReceived(object sender, DataReceivedEventArgs e)
{ {
if (e == null || String.IsNullOrWhiteSpace(e.Data)) if (e == null || String.IsNullOrWhiteSpace(e.Data))
@ -82,7 +81,6 @@ namespace NzbDrone.Common
IISLogger.Error(e.Data); IISLogger.Error(e.Data);
} }
public void RestartServer() public void RestartServer()
{ {
ServerStarted = false; ServerStarted = false;
@ -91,7 +89,6 @@ namespace NzbDrone.Common
StartServer(); StartServer();
} }
public virtual void StopServer() public virtual void StopServer()
{ {
_processProvider.Kill(IISProcessId); _processProvider.Kill(IISProcessId);
@ -112,7 +109,6 @@ namespace NzbDrone.Common
} }
} }
private void OnOutputDataReceived(object s, DataReceivedEventArgs e) private void OnOutputDataReceived(object s, DataReceivedEventArgs e)
{ {
if (e == null || String.IsNullOrWhiteSpace(e.Data) || e.Data.StartsWith("Request started:") || if (e == null || String.IsNullOrWhiteSpace(e.Data) || e.Data.StartsWith("Request started:") ||
@ -121,6 +117,5 @@ namespace NzbDrone.Common
Console.WriteLine(e.Data); Console.WriteLine(e.Data);
} }
} }
} }

11
NzbDrone.Core/CentralDispatch.cs
View File

@ -103,14 +103,7 @@ namespace NzbDrone.Core
ContainerBuilder.RegisterAssemblyTypes(typeof(CentralDispatch).Assembly) ContainerBuilder.RegisterAssemblyTypes(typeof(CentralDispatch).Assembly)
.Where(t => t.BaseType == typeof(ExternalNotificationBase)) .Where(t => t.BaseType == typeof(ExternalNotificationBase))
.As<ExternalNotificationBase>(); .As<ExternalNotificationBase>();
//ContainerBuilder.RegisterType<Xbmc>().As<ExternalNotificationBase>().SingleInstance();
//ContainerBuilder.RegisterType<Smtp>().As<ExternalNotificationBase>().SingleInstance();
//ContainerBuilder.RegisterType<Twitter>().As<ExternalNotificationBase>().SingleInstance();
//ContainerBuilder.RegisterType<Providers.ExternalNotification.Growl>().As<ExternalNotificationBase>().SingleInstance();
//ContainerBuilder.RegisterType<Prowl>().As<ExternalNotificationBase>().SingleInstance();
//ContainerBuilder.RegisterType<Plex>().As<ExternalNotificationBase>().SingleInstance();
} }
private void RegisterMetadataProviders() private void RegisterMetadataProviders()
@ -120,8 +113,6 @@ namespace NzbDrone.Core
ContainerBuilder.RegisterAssemblyTypes(typeof(CentralDispatch).Assembly) ContainerBuilder.RegisterAssemblyTypes(typeof(CentralDispatch).Assembly)
.Where(t => t.IsSubclassOf(typeof(MetadataBase))) .Where(t => t.IsSubclassOf(typeof(MetadataBase)))
.As<MetadataBase>(); .As<MetadataBase>();
//ContainerBuilder.RegisterType<Providers.Metadata.Xbmc>().As<MetadataBase>().SingleInstance();
} }
private void RegisterReporting(IContainer container) private void RegisterReporting(IContainer container)

1
NzbDrone/ApplicationServer.cs
View File

@ -60,6 +60,7 @@ namespace NzbDrone
} }
_iisProvider.StartServer(); _iisProvider.StartServer();
//Todo: verify that IIS is actually started
_debuggerProvider.Attach(); _debuggerProvider.Attach();

6
NzbDrone/Providers/MonitoringProvider.cs
View File

@ -49,7 +49,6 @@ namespace NzbDrone.Providers
_pingTimer.Change(TimeSpan.FromSeconds(5), TimeSpan.FromMinutes(1)); _pingTimer.Change(TimeSpan.FromSeconds(5), TimeSpan.FromMinutes(1));
} }
public virtual void EnsurePriority(object sender) public virtual void EnsurePriority(object sender)
{ {
try try
@ -98,8 +97,8 @@ namespace NzbDrone.Providers
catch (Exception ex) catch (Exception ex)
{ {
_pingFailCounter++; _pingFailCounter++;
logger.Error("Application pool is not responding. Count " + _pingFailCounter + ex.Message); logger.Error("Application pool is not responding. Count: {0} - {1}", _pingFailCounter, ex.Message);
if (_pingFailCounter > 10) if (_pingFailCounter >= 10)
{ {
_pingFailCounter = 0; _pingFailCounter = 0;
_iisProvider.RestartServer(); _iisProvider.RestartServer();
@ -112,7 +111,6 @@ namespace NzbDrone.Providers
_iisProvider.StopServer(); _iisProvider.StopServer();
} }
public static void AppDomainException(Exception excepion) public static void AppDomainException(Exception excepion)
{ {
Console.WriteLine("EPIC FAIL: {0}", excepion); Console.WriteLine("EPIC FAIL: {0}", excepion);