Merge branch 'kay.one' of github.com:NzbDrone/NzbDrone into markus

Conflicts:
	NzbDrone.Core/Providers/ExternalNotification/Prowl.cs
	NzbDrone.Core/Providers/ProwlProvider.cs
pull/7/merge
Mark McDowall 13 years ago
commit 80d7d38c7b

@ -118,7 +118,8 @@
</CodeStyleSettings>
<Daemon.SolutionSettings>
<SkipFilesAndFolders>
<Item>43BD3BBD-1531-4D8F-9C08-E1CD544AB2CD/d:Content</Item>
<Item>43BD3BBD-1531-4D8F-9C08-E1CD544AB2CD/d:Content/d:2011.2.712</Item>
<Item>43BD3BBD-1531-4D8F-9C08-E1CD544AB2CD/d:Content/d:jQueryUI</Item>
</SkipFilesAndFolders>
</Daemon.SolutionSettings>
<SharedSolutionTemplateManager>

@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Growl.Connector;
using NLog;
@ -9,7 +8,7 @@ namespace NzbDrone.Core.Providers
{
public class GrowlProvider
{
private readonly Logger Logger = LogManager.GetCurrentClassLogger();
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
private readonly Application _growlApplication = new Application("NzbDrone");
private GrowlConnector _growlConnector;

@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using NLog;
using Prowlin;
@ -9,12 +7,7 @@ namespace NzbDrone.Core.Providers
{
public class ProwlProvider
{
private readonly Logger Logger = LogManager.GetLogger("ProwlProvider");
public ProwlProvider()
{
}
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
public virtual bool Verify(string apiKey)
{
@ -32,7 +25,7 @@ namespace NzbDrone.Core.Providers
return true;
}
catch(Exception ex)
catch (Exception ex)
{
Logger.TraceException(ex.Message, ex);
Logger.Warn("Invalid API Key: {0}", apiKey);
@ -47,11 +40,11 @@ namespace NzbDrone.Core.Providers
{
var notification = new Notification
{
Application = "NzbDrone",
Description = message,
Event = title,
Priority = priority,
Url = url
Application = "NzbDrone",
Description = message,
Event = title,
Priority = priority,
Url = url
};
foreach (var apiKey in apiKeys.Split(','))
@ -67,7 +60,7 @@ namespace NzbDrone.Core.Providers
return true;
}
catch(Exception ex)
catch (Exception ex)
{
Logger.TraceException(ex.Message, ex);
Logger.Warn("Invalid API Key(s): {0}", apiKeys);

Binary file not shown.
Loading…
Cancel
Save