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

Corrected exception logging.

This commit is contained in:
Mark McDowall 2012-01-16 23:53:42 -08:00
parent 1301dc1b7b
commit 106f073cf2
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
NzbDrone.Common/SecurityProvider.cs
View File

@ -42,7 +42,7 @@ namespace NzbDrone.Common
if (IsNzbDronePortOpen()) if (IsNzbDronePortOpen())
{ {
Logger.Trace("NzbDrone port is already open, skippings"); Logger.Trace("NzbDrone port is already open, skipping.");
return; return;
} }
@ -70,38 +70,38 @@ namespace NzbDrone.Common
{ {
var currentIdentity = WindowsIdentity.GetCurrent(); var currentIdentity = WindowsIdentity.GetCurrent();
if (currentIdentity == null)
{
Logger.Trace("Could not obtain the current user.");
return false;
}
var principal = new WindowsPrincipal(currentIdentity); var principal = new WindowsPrincipal(currentIdentity);
return principal.IsInRole(WindowsBuiltInRole.Administrator); return principal.IsInRole(WindowsBuiltInRole.Administrator);
} }
catch(Exception ex) catch(Exception ex)
{ {
Logger.TraceException("Error checking is current user is an administrator.", ex); Logger.WarnException("Error checking if the current user is an administrator.", ex);
return false; return false;
} }
} }
public virtual bool IsNzbDronePortOpen() public virtual bool IsNzbDronePortOpen()
{ {
var netFwMgrType = Type.GetTypeFromProgID("HNetCfg.FwMgr", false); try
var mgr = (INetFwMgr)Activator.CreateInstance(netFwMgrType);
if (!mgr.LocalPolicy.CurrentProfile.FirewallEnabled)
return false;
var ports = mgr.LocalPolicy.CurrentProfile.GloballyOpenPorts;
foreach (INetFwOpenPort p in ports)
{ {
if (p.Port == _configFileProvider.Port) var netFwMgrType = Type.GetTypeFromProgID("HNetCfg.FwMgr", false);
return true; var mgr = (INetFwMgr)Activator.CreateInstance(netFwMgrType);
}
if (!mgr.LocalPolicy.CurrentProfile.FirewallEnabled)
return false;
var ports = mgr.LocalPolicy.CurrentProfile.GloballyOpenPorts;
foreach (INetFwOpenPort p in ports)
{
if (p.Port == _configFileProvider.Port)
return true;
}
}
catch(Exception ex)
{
Logger.WarnException("Failed to check for open port in firewall", ex);
}
return false; return false;
} }
@ -126,7 +126,7 @@ namespace NzbDrone.Common
} }
catch(Exception ex) catch(Exception ex)
{ {
Logger.Trace("Failed to open port in firewall for NzbDrone" + portNumber, ex); Logger.WarnException("Failed to open port in firewall for NzbDrone" + portNumber, ex);
return false; return false;
} }
} }
@ -158,7 +158,7 @@ namespace NzbDrone.Common
} }
catch(Exception ex) catch(Exception ex)
{ {
Logger.Trace("Failed to close port in firewall for NzbDrone", ex); Logger.WarnException("Failed to close port in firewall for NzbDrone", ex);
} }
return 0; return 0;
@ -181,7 +181,7 @@ namespace NzbDrone.Common
catch(Exception ex) catch(Exception ex)
{ {
Logger.Trace("Error registering URL", ex); Logger.WarnException("Error registering URL", ex);
} }
return false; return false;
@ -204,7 +204,7 @@ namespace NzbDrone.Common
catch (Exception ex) catch (Exception ex)
{ {
Logger.Trace("Error registering URL", ex); Logger.WarnException("Error registering URL", ex);
} }
return false; return false;