From fbd01bc585323442ba6d75850120d4b8a52eede9 Mon Sep 17 00:00:00 2001
From: MaksimChegulov <maksim.chegulov@onlyoffice.com>
Date: Wed, 16 Feb 2022 11:49:19 +0300
Subject: [PATCH] MessaginSystem: IServiceProvider replaced by
 IServiceScopeFactory

---
 .../ASC.MessagingSystem/DbSender/MessagesRepository.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/ASC.MessagingSystem/DbSender/MessagesRepository.cs b/common/ASC.MessagingSystem/DbSender/MessagesRepository.cs
index a7db1f73e2..450d0e01d1 100644
--- a/common/ASC.MessagingSystem/DbSender/MessagesRepository.cs
+++ b/common/ASC.MessagingSystem/DbSender/MessagesRepository.cs
@@ -40,16 +40,16 @@ public class MessagesRepository : IDisposable
     private bool _timerStarted;
 
     public ILog Logger { get; set; }
-    private readonly IServiceProvider _serviceProvider;
+    private readonly IServiceScopeFactory _serviceScopeFactory;
 
-    public MessagesRepository(IServiceProvider serviceProvider, IOptionsMonitor<ILog> options)
+    public MessagesRepository(IServiceScopeFactory serviceScopeFactory, IOptionsMonitor<ILog> options)
     {
         _cacheTime = TimeSpan.FromMinutes(1);
         _cache = new Dictionary<string, EventMessage>();
         _timerStarted = false;
 
         Logger = options.CurrentValue;
-        _serviceProvider = serviceProvider;
+        _serviceScopeFactory = serviceScopeFactory;
 
         _timer = new Timer(FlushCache);
     }
@@ -59,7 +59,7 @@ public class MessagesRepository : IDisposable
         // messages with action code < 2000 are related to login-history
         if ((int)message.Action < 2000)
         {
-            using var scope = _serviceProvider.CreateScope();
+            using var scope = _serviceScopeFactory.CreateScope();
             using var ef = scope.ServiceProvider.GetService<DbContextManager<MessagesContext>>().Get("messages");
 
             AddLoginEvent(message, ef);
@@ -105,7 +105,7 @@ public class MessagesRepository : IDisposable
             return;
         }
 
-        using var scope = _serviceProvider.CreateScope();
+        using var scope = _serviceScopeFactory.CreateScope();
         using var ef = scope.ServiceProvider.GetService<DbContextManager<Messages>>().Get("messages");
         using var tx = ef.Database.BeginTransaction(IsolationLevel.ReadUncommitted);
         var dict = new Dictionary<string, ClientInfo>();