mirror of https://github.com/Jackett/Jackett
Remove IsRunningLegacyOwin check
Dead code since upgrade to Jackett.Server
This commit is contained in:
parent
0ddaa3bef4
commit
524a0c7885
|
@ -177,13 +177,6 @@ namespace Jackett.Common.Indexers
|
||||||
//TODO: Remove this section once users have moved off DPAPI
|
//TODO: Remove this section once users have moved off DPAPI
|
||||||
private bool MigratedFromDPAPI(JToken jsonConfig)
|
private bool MigratedFromDPAPI(JToken jsonConfig)
|
||||||
{
|
{
|
||||||
if (EnvironmentUtil.IsRunningLegacyOwin)
|
|
||||||
{
|
|
||||||
//Still running legacy Owin and using the DPAPI, we don't want to migrate
|
|
||||||
logger.Debug(ID + " - Running Owin, no need to migrate from DPAPI");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool runningOnDotNetCore = RuntimeInformation.FrameworkDescription.IndexOf("core", StringComparison.OrdinalIgnoreCase) >= 0;
|
bool runningOnDotNetCore = RuntimeInformation.FrameworkDescription.IndexOf("core", StringComparison.OrdinalIgnoreCase) >= 0;
|
||||||
bool isWindows = Environment.OSVersion.Platform == PlatformID.Win32NT;
|
bool isWindows = Environment.OSVersion.Platform == PlatformID.Win32NT;
|
||||||
|
|
||||||
|
|
|
@ -84,17 +84,8 @@ namespace Jackett.Common.Models.Config
|
||||||
if (options.ListenPublic && options.ListenPrivate)
|
if (options.ListenPublic && options.ListenPrivate)
|
||||||
{
|
{
|
||||||
Console.WriteLine("You can only use listen private OR listen publicly.");
|
Console.WriteLine("You can only use listen private OR listen publicly.");
|
||||||
|
|
||||||
//TODO: Remove once off Owin
|
|
||||||
if (EnvironmentUtil.IsRunningLegacyOwin)
|
|
||||||
{
|
|
||||||
Engine.Exit(1);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Environment.Exit(1);
|
Environment.Exit(1);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// SSL Fix
|
// SSL Fix
|
||||||
runtimeSettings.DoSSLFix = options.SSLFix;
|
runtimeSettings.DoSSLFix = options.SSLFix;
|
||||||
|
|
|
@ -71,11 +71,6 @@ namespace Jackett.Common.Plumbing
|
||||||
|
|
||||||
private void RegisterWebClient<WebClientType>(ContainerBuilder builder)
|
private void RegisterWebClient<WebClientType>(ContainerBuilder builder)
|
||||||
{
|
{
|
||||||
//TODO: Remove once off Owin
|
|
||||||
if (EnvironmentUtil.IsRunningLegacyOwin)
|
|
||||||
{
|
|
||||||
Engine.WebClientType = typeof(WebClientType);
|
|
||||||
}
|
|
||||||
builder.RegisterType<WebClientType>().As<WebClient>();
|
builder.RegisterType<WebClientType>().As<WebClient>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -338,17 +338,8 @@ namespace Jackett.Common.Services
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.Info("Exiting Jackett..");
|
logger.Info("Exiting Jackett..");
|
||||||
|
|
||||||
//TODO: Remove once off Owin
|
|
||||||
if (EnvironmentUtil.IsRunningLegacyOwin)
|
|
||||||
{
|
|
||||||
Engine.Exit(0);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Environment.Exit(0);
|
Environment.Exit(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,23 +24,5 @@ namespace Jackett.Common.Utils
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool IsRunningLegacyOwin
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
bool runningOwin;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
runningOwin = AppDomain.CurrentDomain.GetAssemblies().Where(x => x.FullName.StartsWith("Jackett, ")).Any();
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
runningOwin = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return runningOwin;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue