DysonNetwork/Swarm
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Fixes distributed lock

Browse Source
This commit is contained in:
LittleSheep 2025-05-25 16:09:37 +08:00
parent 916d9500a2
commit b4c26f2d55
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
DysonNetwork.Sphere/Account/AccountEventService.cs
View File

@ -143,8 +143,21 @@ public class AccountEventService(
{
var lockKey = $"{CheckInLockKey}{user.Id}";
await using var lk = await cache.AcquireLockAsync(lockKey, TimeSpan.FromMinutes(10), TimeSpan.Zero);
if (lk is null) throw new InvalidOperationException("Check-in was in progress.");
try
{
var lk = await cache.AcquireLockAsync(lockKey, TimeSpan.FromMinutes(1), TimeSpan.FromMilliseconds(100));
if (lk != null)
await lk.ReleaseAsync();
}
catch
{
// Ignore errors from this pre-check
}
// Now try to acquire the lock properly
await using var lockObj = await cache.AcquireLockAsync(lockKey, TimeSpan.FromMinutes(1), TimeSpan.FromSeconds(5));
if (lockObj is null) throw new InvalidOperationException("Check-in was in progress.");
var cultureInfo = new CultureInfo(user.Language, false);
CultureInfo.CurrentCulture = cultureInfo;
@ -205,6 +218,7 @@ public class AccountEventService(
s.SetProperty(b => b.Experience, b => b.Experience + result.RewardExperience)
);
db.AccountCheckInResults.Add(result);
await db.SaveChangesAsync(); // Don't forget to save changes to the database
await act.CreateActivity(
user,

12
DysonNetwork.Sphere/Storage/CacheService.cs
View File

@ -117,8 +117,6 @@ public class RedisDistributedLock : IDistributedLock
private readonly IDatabase _database;
private bool _disposed;
private const string LockKeyPrefix = "Lock_";
public string Resource { get; }
public string LockId { get; }
@ -144,7 +142,7 @@ public class RedisDistributedLock : IDistributedLock
var result = await _database.ScriptEvaluateAsync(
script,
[$"{LockKeyPrefix}{Resource}"],
[$"{CacheServiceRedis.LockKeyPrefix}{Resource}"],
[LockId, (long)timeSpan.TotalMilliseconds]
);
@ -166,7 +164,7 @@ public class RedisDistributedLock : IDistributedLock
await _database.ScriptEvaluateAsync(
script,
[$"{LockKeyPrefix}{Resource}"],
[$"{CacheServiceRedis.LockKeyPrefix}{Resource}"],
[LockId]
);
@ -186,11 +184,11 @@ public class CacheServiceRedis : ICacheService
private readonly JsonSerializerSettings _serializerSettings;
// Global prefix for all cache keys
private const string GlobalKeyPrefix = "dyson:";
public const string GlobalKeyPrefix = "dyson:";
// Using prefixes for different types of keys
private const string GroupKeyPrefix = GlobalKeyPrefix + "cg:";
private const string LockKeyPrefix = GlobalKeyPrefix + "lock:";
public const string GroupKeyPrefix = GlobalKeyPrefix + "cg:";
public const string LockKeyPrefix = GlobalKeyPrefix + "lock:";
public CacheServiceRedis(IConnectionMultiplexer redis)
{