Do custom gzip compression on mono when returning api responses to avoid a memory leak.
This commit is contained in:
parent
567719e6c4
commit
40b34dbb5e
|
@ -15,9 +15,14 @@ namespace Sonarr.Http.Extensions.Pipelines
|
||||||
|
|
||||||
public int Order => 0;
|
public int Order => 0;
|
||||||
|
|
||||||
|
private readonly Action<Action<Stream>, Stream> _writeGZipStream;
|
||||||
|
|
||||||
public GzipCompressionPipeline(Logger logger)
|
public GzipCompressionPipeline(Logger logger)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
|
|
||||||
|
// On Mono GZipStream/DeflateStream leaks memory if an exception is thrown, use an intermediate buffer in that case.
|
||||||
|
_writeGZipStream = NzbDrone.Common.EnvironmentInfo.PlatformInfo.IsMono ? WriteGZipStreamMono : (Action<Action<Stream>, Stream>)WriteGZipStream;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Register(IPipelines pipelines)
|
public void Register(IPipelines pipelines)
|
||||||
|
@ -43,14 +48,7 @@ namespace Sonarr.Http.Extensions.Pipelines
|
||||||
var contents = response.Contents;
|
var contents = response.Contents;
|
||||||
|
|
||||||
response.Headers["Content-Encoding"] = "gzip";
|
response.Headers["Content-Encoding"] = "gzip";
|
||||||
response.Contents = responseStream =>
|
response.Contents = responseStream => _writeGZipStream(contents, responseStream);
|
||||||
{
|
|
||||||
using (var gzip = new GZipStream(responseStream, CompressionMode.Compress, true))
|
|
||||||
using (var buffered = new BufferedStream(gzip, 8192))
|
|
||||||
{
|
|
||||||
contents.Invoke(buffered);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -61,6 +59,25 @@ namespace Sonarr.Http.Extensions.Pipelines
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void WriteGZipStreamMono(Action<Stream> innerContent, Stream targetStream)
|
||||||
|
{
|
||||||
|
using (var membuffer = new MemoryStream())
|
||||||
|
{
|
||||||
|
WriteGZipStream(innerContent, membuffer);
|
||||||
|
membuffer.Position = 0;
|
||||||
|
membuffer.CopyTo(targetStream);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void WriteGZipStream(Action<Stream> innerContent, Stream targetStream)
|
||||||
|
{
|
||||||
|
using (var gzip = new GZipStream(targetStream, CompressionMode.Compress, true))
|
||||||
|
using (var buffered = new BufferedStream(gzip, 8192))
|
||||||
|
{
|
||||||
|
innerContent.Invoke(buffered);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private static bool ContentLengthIsTooSmall(Response response)
|
private static bool ContentLengthIsTooSmall(Response response)
|
||||||
{
|
{
|
||||||
var contentLength = response.Headers.GetValueOrDefault("Content-Length");
|
var contentLength = response.Headers.GetValueOrDefault("Content-Length");
|
||||||
|
|
Loading…
Reference in New Issue