diff --git a/common/ASC.Core.Common/Hosting/Interfaces/IRegisterInstanceDao.cs b/common/ASC.Core.Common/Hosting/Interfaces/IRegisterInstanceDao.cs index 2ca41e7762..bde9bb9060 100644 --- a/common/ASC.Core.Common/Hosting/Interfaces/IRegisterInstanceDao.cs +++ b/common/ASC.Core.Common/Hosting/Interfaces/IRegisterInstanceDao.cs @@ -29,7 +29,7 @@ namespace ASC.Core.Common.Hosting.Interfaces; [Scope] public interface IRegisterInstanceDao where T : IHostedService { - Task AddOrUpdate(InstanceRegistration obj); - Task> GetAll(); - Task Delete(string instanceId); + Task AddOrUpdateAsync(InstanceRegistration obj); + Task> GetAllAsync(); + Task DeleteAsync(string instanceId); } diff --git a/common/ASC.Core.Common/Hosting/RegisterInstanceDao.cs b/common/ASC.Core.Common/Hosting/RegisterInstanceDao.cs index ca8dc3dc50..206751fff9 100644 --- a/common/ASC.Core.Common/Hosting/RegisterInstanceDao.cs +++ b/common/ASC.Core.Common/Hosting/RegisterInstanceDao.cs @@ -40,10 +40,10 @@ public class RegisterInstanceDao : IRegisterInstanceDao where T : IHostedS _dbContextFactory = dbContextFactory; } - public async Task AddOrUpdate(InstanceRegistration obj) + public async Task AddOrUpdateAsync(InstanceRegistration obj) { - using var _instanceRegistrationContext = _dbContextFactory.CreateDbContext(); - var inst = _instanceRegistrationContext.InstanceRegistrations.Find(obj.InstanceRegistrationId); + using var _instanceRegistrationContext = await _dbContextFactory.CreateDbContextAsync(); + var inst = await _instanceRegistrationContext.InstanceRegistrations.FindAsync(obj.InstanceRegistrationId); if (inst == null) { @@ -58,7 +58,7 @@ public class RegisterInstanceDao : IRegisterInstanceDao where T : IHostedS do { - saveFailed = false; + saveFailed = false; try { @@ -81,18 +81,18 @@ public class RegisterInstanceDao : IRegisterInstanceDao where T : IHostedS while (saveFailed); } - public async Task> GetAll() + public async Task> GetAllAsync() { - using var _instanceRegistrationContext = _dbContextFactory.CreateDbContext(); + using var _instanceRegistrationContext = await _dbContextFactory.CreateDbContextAsync(); return await _instanceRegistrationContext.InstanceRegistrations .Where(x => x.WorkerTypeName == typeof(T).GetFormattedName()) .ToListAsync(); } - public async Task Delete(string instanceId) + public async Task DeleteAsync(string instanceId) { - using var _instanceRegistrationContext = _dbContextFactory.CreateDbContext(); - var item = _instanceRegistrationContext.InstanceRegistrations.Find(instanceId); + using var _instanceRegistrationContext = await _dbContextFactory.CreateDbContextAsync(); + var item = await _instanceRegistrationContext.InstanceRegistrations.FindAsync(instanceId); if (item == null) { diff --git a/common/ASC.Core.Common/Hosting/RegisterInstanceManager.cs b/common/ASC.Core.Common/Hosting/RegisterInstanceManager.cs index bb0df650ba..ab16c46c5f 100644 --- a/common/ASC.Core.Common/Hosting/RegisterInstanceManager.cs +++ b/common/ASC.Core.Common/Hosting/RegisterInstanceManager.cs @@ -54,7 +54,7 @@ public class RegisterInstanceManager : IRegisterInstanceManager where T : { if (_isSingletoneMode) return; - var instances = await _registerInstanceRepository.GetAll(); + var instances = await _registerInstanceRepository.GetAllAsync(); var registeredInstance = instances.FirstOrDefault(x => x.InstanceRegistrationId == instanceId); var instance = registeredInstance ?? new InstanceRegistration @@ -75,19 +75,19 @@ public class RegisterInstanceManager : IRegisterInstanceManager where T : } } - await _registerInstanceRepository.AddOrUpdate(instance); + await _registerInstanceRepository.AddOrUpdateAsync(instance); } public async Task UnRegister(string instanceId) { - await _registerInstanceRepository.Delete(instanceId); + await _registerInstanceRepository.DeleteAsync(instanceId); } public async Task IsActive(string instanceId) { if (_isSingletoneMode) return await Task.FromResult(true); - var instances = await _registerInstanceRepository.GetAll(); + var instances = await _registerInstanceRepository.GetAllAsync(); var instance = instances.FirstOrDefault(x => x.InstanceRegistrationId == instanceId); return instance is not null && instance.IsActive; @@ -97,12 +97,12 @@ public class RegisterInstanceManager : IRegisterInstanceManager where T : { if (_isSingletoneMode) return await Task.FromResult(new List()); - var instances = await _registerInstanceRepository.GetAll(); + var instances = await _registerInstanceRepository.GetAllAsync(); var oldRegistrations = instances.Where(IsOrphanInstance).ToList(); foreach (var instanceRegistration in oldRegistrations) { - await _registerInstanceRepository.Delete(instanceRegistration.InstanceRegistrationId); + await _registerInstanceRepository.DeleteAsync(instanceRegistration.InstanceRegistrationId); } return oldRegistrations.Select(x => x.InstanceRegistrationId).ToList();