mirror of
https://github.com/Prowlarr/Prowlarr.git
synced 2025-09-17 17:14:18 +02:00
More Mono Cleaning
This commit is contained in:
@@ -229,11 +229,6 @@ namespace NzbDrone.Common.Test.Http
|
|||||||
[Test]
|
[Test]
|
||||||
public void should_follow_redirects_to_https()
|
public void should_follow_redirects_to_https()
|
||||||
{
|
{
|
||||||
if (typeof(TDispatcher) == typeof(ManagedHttpDispatcher) && PlatformInfo.IsMono)
|
|
||||||
{
|
|
||||||
Assert.Ignore("Will fail on tls1.2 via managed dispatcher, ignore.");
|
|
||||||
}
|
|
||||||
|
|
||||||
var request = new HttpRequestBuilder($"https://{_httpBinHost}/redirect-to")
|
var request = new HttpRequestBuilder($"https://{_httpBinHost}/redirect-to")
|
||||||
.AddQueryParam("url", $"https://radarr.video/")
|
.AddQueryParam("url", $"https://radarr.video/")
|
||||||
.Build();
|
.Build();
|
||||||
|
@@ -34,19 +34,10 @@ namespace NzbDrone.Common.Http.Dispatchers
|
|||||||
{
|
{
|
||||||
var webRequest = (HttpWebRequest)WebRequest.Create((Uri)request.Url);
|
var webRequest = (HttpWebRequest)WebRequest.Create((Uri)request.Url);
|
||||||
|
|
||||||
if (PlatformInfo.IsMono)
|
// Deflate is not a standard and could break depending on implementation.
|
||||||
{
|
// we should just stick with the more compatible Gzip
|
||||||
// On Mono GZipStream/DeflateStream leaks memory if an exception is thrown, use an intermediate buffer in that case.
|
//http://stackoverflow.com/questions/8490718/how-to-decompress-stream-deflated-with-java-util-zip-deflater-in-net
|
||||||
webRequest.AutomaticDecompression = DecompressionMethods.None;
|
webRequest.AutomaticDecompression = DecompressionMethods.GZip;
|
||||||
webRequest.Headers.Add("Accept-Encoding", "gzip");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Deflate is not a standard and could break depending on implementation.
|
|
||||||
// we should just stick with the more compatible Gzip
|
|
||||||
//http://stackoverflow.com/questions/8490718/how-to-decompress-stream-deflated-with-java-util-zip-deflater-in-net
|
|
||||||
webRequest.AutomaticDecompression = DecompressionMethods.GZip;
|
|
||||||
}
|
|
||||||
|
|
||||||
webRequest.Method = request.Method.ToString();
|
webRequest.Method = request.Method.ToString();
|
||||||
webRequest.UserAgent = _userAgentBuilder.GetUserAgent(request.UseSimplifiedUserAgent);
|
webRequest.UserAgent = _userAgentBuilder.GetUserAgent(request.UseSimplifiedUserAgent);
|
||||||
@@ -127,19 +118,6 @@ namespace NzbDrone.Common.Http.Dispatchers
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
data = await responseStream.ToBytes();
|
data = await responseStream.ToBytes();
|
||||||
|
|
||||||
if (PlatformInfo.IsMono && httpWebResponse.ContentEncoding == "gzip")
|
|
||||||
{
|
|
||||||
using (var compressedStream = new MemoryStream(data))
|
|
||||||
using (var gzip = new GZipStream(compressedStream, CompressionMode.Decompress))
|
|
||||||
using (var decompressedStream = new MemoryStream())
|
|
||||||
{
|
|
||||||
gzip.CopyTo(decompressedStream);
|
|
||||||
data = decompressedStream.ToArray();
|
|
||||||
}
|
|
||||||
|
|
||||||
httpWebResponse.Headers.Remove("Content-Encoding");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
@@ -38,16 +38,6 @@ namespace NzbDrone.Common.Instrumentation
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (PlatformInfo.IsMono)
|
|
||||||
{
|
|
||||||
if ((exception is TypeInitializationException && exception.InnerException is DllNotFoundException) ||
|
|
||||||
exception is DllNotFoundException)
|
|
||||||
{
|
|
||||||
Logger.Debug(exception, "Minor Fail: " + exception.Message);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Console.WriteLine("EPIC FAIL: {0}", exception);
|
Console.WriteLine("EPIC FAIL: {0}", exception);
|
||||||
Logger.Fatal(exception, "EPIC FAIL.");
|
Logger.Fatal(exception, "EPIC FAIL.");
|
||||||
}
|
}
|
||||||
|
@@ -106,13 +106,6 @@ namespace NzbDrone.Common.Instrumentation.Sentry
|
|||||||
o.Debug = false;
|
o.Debug = false;
|
||||||
o.DiagnosticLevel = SentryLevel.Debug;
|
o.DiagnosticLevel = SentryLevel.Debug;
|
||||||
o.Release = BuildInfo.Release;
|
o.Release = BuildInfo.Release;
|
||||||
if (PlatformInfo.IsMono)
|
|
||||||
{
|
|
||||||
// Mono 6.0 broke GzipStream.WriteAsync
|
|
||||||
// TODO: Check specific version
|
|
||||||
o.RequestBodyCompressionLevel = System.IO.Compression.CompressionLevel.NoCompression;
|
|
||||||
}
|
|
||||||
|
|
||||||
o.BeforeSend = x => SentryCleanser.CleanseEvent(x);
|
o.BeforeSend = x => SentryCleanser.CleanseEvent(x);
|
||||||
o.BeforeBreadcrumb = x => SentryCleanser.CleanseBreadcrumb(x);
|
o.BeforeBreadcrumb = x => SentryCleanser.CleanseBreadcrumb(x);
|
||||||
o.Environment = BuildInfo.Branch;
|
o.Environment = BuildInfo.Branch;
|
||||||
@@ -155,7 +148,7 @@ namespace NzbDrone.Common.Instrumentation.Sentry
|
|||||||
{
|
{
|
||||||
scope.SetTag("is_docker", $"{osInfo.IsDocker}");
|
scope.SetTag("is_docker", $"{osInfo.IsDocker}");
|
||||||
|
|
||||||
if (osInfo.Name != null && PlatformInfo.IsMono)
|
if (osInfo.Name != null && !OsInfo.IsWindows)
|
||||||
{
|
{
|
||||||
// Sentry auto-detection of non-Windows platforms isn't that accurate on certain devices.
|
// Sentry auto-detection of non-Windows platforms isn't that accurate on certain devices.
|
||||||
scope.Contexts.OperatingSystem.Name = osInfo.Name.FirstCharToUpper();
|
scope.Contexts.OperatingSystem.Name = osInfo.Name.FirstCharToUpper();
|
||||||
|
@@ -366,11 +366,6 @@ namespace NzbDrone.Common.Processes
|
|||||||
|
|
||||||
private (string Path, string Args) GetPathAndArgs(string path, string args)
|
private (string Path, string Args) GetPathAndArgs(string path, string args)
|
||||||
{
|
{
|
||||||
if (PlatformInfo.IsMono && path.EndsWith(".exe", StringComparison.InvariantCultureIgnoreCase))
|
|
||||||
{
|
|
||||||
return ("mono", $"--debug {path} {args}");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (OsInfo.IsWindows && path.EndsWith(".bat", StringComparison.InvariantCultureIgnoreCase))
|
if (OsInfo.IsWindows && path.EndsWith(".bat", StringComparison.InvariantCultureIgnoreCase))
|
||||||
{
|
{
|
||||||
return ("cmd.exe", $"/c {path} {args}");
|
return ("cmd.exe", $"/c {path} {args}");
|
||||||
|
@@ -44,10 +44,6 @@ namespace NzbDrone.Test.Common
|
|||||||
{
|
{
|
||||||
consoleExe = "Prowlarr.Console.exe";
|
consoleExe = "Prowlarr.Console.exe";
|
||||||
}
|
}
|
||||||
else if (PlatformInfo.IsMono)
|
|
||||||
{
|
|
||||||
consoleExe = "Prowlarr.exe";
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
consoleExe = "Prowlarr";
|
consoleExe = "Prowlarr";
|
||||||
|
Reference in New Issue
Block a user