Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed conflicting criteria from IsProduction check.

This commit is contained in:
Taloth Saldono 2016-09-20 21:30:46 +02:00
parent a72b856fb8
commit a0b4d3a38d
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/NzbDrone.Common/EnvironmentInfo/RuntimeInfoBase.cs
View File

@ -22,13 +22,13 @@ namespace NzbDrone.Common.EnvironmentInfo
serviceProvider.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME) && serviceProvider.ServiceExist(ServiceProvider.NZBDRONE_SERVICE_NAME) &&
serviceProvider.GetStatus(ServiceProvider.NZBDRONE_SERVICE_NAME) == ServiceControllerStatus.StartPending; serviceProvider.GetStatus(ServiceProvider.NZBDRONE_SERVICE_NAME) == ServiceControllerStatus.StartPending;
//Guarded to avoid issues when running in a non-managed process //Guarded to avoid issues when running in a non-managed process
var entry = Assembly.GetEntryAssembly(); var entry = Assembly.GetEntryAssembly();
if (entry != null) if (entry != null)
{ {
ExecutingApplication = entry.Location; ExecutingApplication = entry.Location;
} }
} }
static RuntimeInfoBase() static RuntimeInfoBase()
@ -69,7 +69,7 @@ namespace NzbDrone.Common.EnvironmentInfo
public bool IsWindowsService { get; private set; } public bool IsWindowsService { get; private set; }
public bool IsConsole public bool IsConsole
{ {
get get
{ {
if (OsInfo.IsWindows) if (OsInfo.IsWindows)
@ -78,7 +78,7 @@ namespace NzbDrone.Common.EnvironmentInfo
} }
return true; return true;
} }
} }
public bool IsRunning { get; set; } public bool IsRunning { get; set; }
@ -105,7 +105,7 @@ namespace NzbDrone.Common.EnvironmentInfo
} }
catch catch
{ {
} }
try try
@ -115,15 +115,14 @@ namespace NzbDrone.Common.EnvironmentInfo
} }
catch catch
{ {
} }
string lowerCurrentDir = Directory.GetCurrentDirectory().ToLower(); string lowerCurrentDir = Directory.GetCurrentDirectory().ToLower();
if (lowerCurrentDir.Contains("teamcity")) return false; if (lowerCurrentDir.Contains("teamcity")) return false;
if (lowerCurrentDir.Contains("_output")) return false; if (lowerCurrentDir.Contains("_output")) return false;
if (lowerCurrentDir.StartsWith("/run/")) return false;
return true; return true;
} }
} }
} }