notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend/core] Fix instance bootstrap - DistributedCacheExtensions wasn't handling recursive properties correctly

Browse source
This commit is contained in:
Laura Hausmann 2024-02-24 01:24:27 +01:00
parent 7c1de50768
commit 7d1c85f5e8
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Iceshrimp.Backend/Core/Extensions/DistributedCacheExtensions.cs
View file

@ -1,4 +1,5 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization;
using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Caching.Distributed;
namespace Iceshrimp.Backend.Core.Extensions; namespace Iceshrimp.Backend.Core.Extensions;
@ -11,6 +12,9 @@ public static class DistributedCacheExtensions
//TODO: renew option on GetAsync and FetchAsync //TODO: renew option on GetAsync and FetchAsync
//TODO: check that this actually works for complex types (sigh) //TODO: check that this actually works for complex types (sigh)
private static readonly JsonSerializerOptions Options =
new(JsonSerializerOptions.Default) { ReferenceHandler = ReferenceHandler.Preserve };
public static async Task<T?> GetAsync<T>(this IDistributedCache cache, string key) where T : class public static async Task<T?> GetAsync<T>(this IDistributedCache cache, string key) where T : class
{ {
var buffer = await cache.GetAsync(key); var buffer = await cache.GetAsync(key);
@ -19,7 +23,7 @@ public static class DistributedCacheExtensions
var stream = new MemoryStream(buffer); var stream = new MemoryStream(buffer);
try try
{ {
var data = await JsonSerializer.DeserializeAsync<T?>(stream); var data = await JsonSerializer.DeserializeAsync<T?>(stream, Options);
return data; return data;
} }
catch catch
@ -36,7 +40,7 @@ public static class DistributedCacheExtensions
var stream = new MemoryStream(buffer); var stream = new MemoryStream(buffer);
try try
{ {
var data = await JsonSerializer.DeserializeAsync<T?>(stream); var data = await JsonSerializer.DeserializeAsync<T?>(stream, Options);
return data; return data;
} }
catch catch
@ -86,7 +90,7 @@ public static class DistributedCacheExtensions
public static async Task SetAsync<T>(this IDistributedCache cache, string key, T data, TimeSpan ttl) public static async Task SetAsync<T>(this IDistributedCache cache, string key, T data, TimeSpan ttl)
{ {
using var stream = new MemoryStream(); using var stream = new MemoryStream();
await JsonSerializer.SerializeAsync(stream, data); await JsonSerializer.SerializeAsync(stream, data, Options);
stream.Position = 0; stream.Position = 0;
var options = new DistributedCacheEntryOptions { AbsoluteExpirationRelativeToNow = ttl }; var options = new DistributedCacheEntryOptions { AbsoluteExpirationRelativeToNow = ttl };
await cache.SetAsync(key, stream.ToArray(), options); await cache.SetAsync(key, stream.ToArray(), options);