Feature/clear events

ASC.Web.sln

@@ -87,6 +87,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Calendar", "products\AS
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.SsoAuth.Svc", "common\services\ASC.SsoAuth.Svc\ASC.SsoAuth.Svc.csproj", "{6AD828EA-FBA2-4D30-B969-756B3BE78E4E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.ClearEvents", "common\services\ASC.ClearEvents\ASC.ClearEvents.csproj", "{448221A8-EABA-4200-9192-E08BF241A487}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.CRM.BackgroundTasks", "products\ASC.CRM\BackgroundTasks\ASC.CRM.BackgroundTasks.csproj", "{E52C0E35-A05C-437F-8FF2-3E0AC9F81433}"
 EndProject
 Global
@@ -247,6 +249,10 @@ Global
 		{6AD828EA-FBA2-4D30-B969-756B3BE78E4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6AD828EA-FBA2-4D30-B969-756B3BE78E4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6AD828EA-FBA2-4D30-B969-756B3BE78E4E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{448221A8-EABA-4200-9192-E08BF241A487}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{448221A8-EABA-4200-9192-E08BF241A487}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{448221A8-EABA-4200-9192-E08BF241A487}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{448221A8-EABA-4200-9192-E08BF241A487}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E52C0E35-A05C-437F-8FF2-3E0AC9F81433}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E52C0E35-A05C-437F-8FF2-3E0AC9F81433}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E52C0E35-A05C-437F-8FF2-3E0AC9F81433}.Release|Any CPU.ActiveCfg = Release|Any CPU

build/run/ClearEvents.bat

@@ -0,0 +1,2 @@
+echo "RUN ASC.ClearEvents"
+call dotnet run --project ..\..\common\services\ASC.ClearEvents\ASC.ClearEvents.csproj --no-build --$STORAGE_ROOT=..\..\Data  --log__dir=..\..\Logs --log__name=clearEvents

common/ASC.MessagingSystem/DbSender/MessagesRepository.cs

@@ -60,8 +60,6 @@ public class MessagesRepository: IDisposable
         private readonly Timer Timer;
         private bool timerStarted;
 
-        private readonly Timer ClearTimer;
-
         public ILog Log { get; set; }
         private IServiceProvider ServiceProvider { get; }
 
@@ -76,8 +74,6 @@ public MessagesRepository(IServiceProvider serviceProvider, IOptionsMonitor<ILog
             ServiceProvider = serviceProvider;
 
             Timer = new Timer(FlushCache);
-            ClearTimer = new Timer(DeleteOldEvents);
-            ClearTimer.Change(new TimeSpan(0), TimeSpan.FromDays(1));
         }
 
         public void Add(EventMessage message)
@@ -267,67 +263,12 @@ private static string GetPlatform(ClientInfo clientInfo)
                        : string.Format("{0} {1}", clientInfo.OS.Family, clientInfo.OS.Major);
         }
 
-        //TODO: move to external service and fix
-        private void DeleteOldEvents(object state)
-        {
-            try
-            {
-                GetOldEvents(r => r.LoginEvents, "LoginHistoryLifeTime");
-                GetOldEvents(r => r.AuditEvents, "AuditTrailLifeTime");
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex.Message, ex);
-            }
-        }
-
-        private void GetOldEvents<T>(Expression<Func<MessagesContext, DbSet<T>>> func, string settings) where T : MessageEvent
-        {
-            List<T> ids;
-            var compile = func.Compile();
-            do
-            {
-                using var scope = ServiceProvider.CreateScope();
-                using var ef = scope.ServiceProvider.GetService<DbContextManager<MessagesContext>>().Get("messages");
-                var table = compile.Invoke(ef);
-
-                var ae = table
-                    .Join(ef.Tenants, r => r.TenantId, r => r.Id, (audit, tenant) => audit)
-                    .Select(r => new
-                    {
-                        r.Id,
-                        r.Date,
-                        r.TenantId,
-                        ef = r
-                    })
-                    .Where(r => r.Date < DateTime.UtcNow.AddDays(-Convert.ToDouble(
-                        ef.WebstudioSettings
-                        .Where(a => a.TenantId == r.TenantId && a.Id == TenantAuditSettings.Guid)
-                        .Select(r => JsonExtensions.JsonValue(nameof(r.Data).ToLower(), settings))
-                        .FirstOrDefault() ?? TenantAuditSettings.MaxLifeTime.ToString())))
-                    .Take(1000);
-
-                ids = ae.Select(r => r.ef).ToList();
-
-                if (!ids.Any()) return;
-
-                table.RemoveRange(ids);
-                ef.SaveChanges();
-
-            } while (ids.Any());
-        }
-
         public void Dispose()
         {
             if (Timer != null)
             {
                 Timer.Dispose();
             }
-
-            if (ClearTimer != null)
-            {
-                ClearTimer.Dispose();
-            }
         }
     }
 

common/services/ASC.ClearEvents/ASC.ClearEvents.csproj

@@ -0,0 +1,40 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <ApplicationIcon />
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebugType>none</DebugType>
+    <DebugSymbols>false</DebugSymbols>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Remove="Properties\launchSettings.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <_WebToolingArtifacts Remove="Properties\launchSettings.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Properties\launchSettings.json">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\ASC.Common\ASC.Common.csproj" />
+    <ProjectReference Include="..\..\ASC.Core.Common\ASC.Core.Common.csproj" />
+    <ProjectReference Include="..\ASC.Data.Storage.Encryption\ASC.Data.Storage.Encryption.csproj" />
+
+    <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="5.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
+  </ItemGroup>
+
+
+</Project>

common/services/ASC.ClearEvents/ClearEventsServiceLauncher.cs

@@ -0,0 +1,135 @@
+/*
+ *
+ * (c) Copyright Ascensio System Limited 2010-2018
+ *
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ *
+ * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
+ * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ *
+ * You can contact Ascensio System SIA by email at [email protected]
+ *
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
+ *
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic 
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
+ * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ *
+*/
+
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading;
+using System.Threading.Tasks;
+
+using ASC.Common;
+using ASC.Common.Logging;
+using ASC.Core.Common.EF;
+using ASC.Core.Common.EF.Context;
+using ASC.Core.Common.EF.Model;
+using ASC.Core.Tenants;
+
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
+
+namespace ASC.Thumbnails.Svc
+{
+    [Scope(Additional = typeof(MessagesRepositoryExtension))]
+    public class ClearEventsServiceLauncher : IHostedService
+    {
+        private ILog Log { get; set; }
+        private IServiceProvider ServiceProvider { get; }
+        private Timer ClearTimer;
+
+        public ClearEventsServiceLauncher(IOptionsMonitor<ILog> options, IServiceProvider serviceProvider)
+        {
+            Log = options.CurrentValue;
+            ServiceProvider = serviceProvider;
+        }
+
+        public Task StartAsync(CancellationToken cancellationToken)
+        {
+            ClearTimer = new Timer(DeleteOldEvents);
+            ClearTimer.Change(new TimeSpan(0), TimeSpan.FromDays(1));
+            return Task.CompletedTask;
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken)
+        {
+            if (ClearTimer != null)
+            {
+                ClearTimer.Dispose();
+            }
+            return Task.CompletedTask;
+        }
+
+        private void DeleteOldEvents(object state)
+        {
+            try
+            {
+                GetOldEvents(r => r.LoginEvents, "LoginHistoryLifeTime");
+                GetOldEvents(r => r.AuditEvents, "AuditTrailLifeTime");
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex.Message, ex);
+            }
+        }
+
+        private void GetOldEvents<T>(Expression<Func<MessagesContext, DbSet<T>>> func, string settings) where T : MessageEvent
+        {
+            List<T> ids;
+            var compile = func.Compile();
+            do
+            {
+                using var scope = ServiceProvider.CreateScope();
+                using var ef = scope.ServiceProvider.GetService<DbContextManager<MessagesContext>>().Get("messages");
+                var table = compile.Invoke(ef);
+
+                var ae = table
+                    .Join(ef.Tenants, r => r.TenantId, r => r.Id, (audit, tenant) => audit)
+                    .Select(r => new
+                    {
+                        r.Id,
+                        r.Date,
+                        r.TenantId,
+                        ef = r
+                    })
+                    .Where(r => r.Date < DateTime.UtcNow.AddDays(-Convert.ToDouble(
+                        ef.WebstudioSettings
+                        .Where(a => a.TenantId == r.TenantId && a.Id == TenantAuditSettings.Guid)
+                        .Select(r => JsonExtensions.JsonValue(nameof(r.Data).ToLower(), settings))
+                        .FirstOrDefault() ?? TenantAuditSettings.MaxLifeTime.ToString())))
+                    .Take(1000);
+
+                ids = ae.Select(r => r.ef).ToList();
+
+                if (!ids.Any()) return;
+
+                table.RemoveRange(ids);
+                ef.SaveChanges();
+
+            } while (ids.Any());
+        }
+    }
+
+    public class MessagesRepositoryExtension
+    {
+        public static void Register(DIHelper services)
+        {
+            services.TryAdd<DbContextManager<MessagesContext>>();
+        }
+    }
+
+}

common/services/ASC.ClearEvents/Program.cs

@@ -0,0 +1,96 @@
+/*
+ *
+ * (c) Copyright Ascensio System Limited 2010-2020
+ *
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ *
+ * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
+ * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ *
+ * You can contact Ascensio System SIA by email at [email protected]
+ *
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
+ *
+ * Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic 
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
+ * in every copy of the program you distribute. 
+ * Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ *
+*/
+
+
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+
+using ASC.Common;
+using ASC.Common.Caching;
+using ASC.Common.DependencyInjection;
+using ASC.Common.Logging;
+using ASC.Common.Utils;
+
+using Autofac;
+using Autofac.Extensions.DependencyInjection;
+
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+
+namespace ASC.Thumbnails.Svc
+{
+    public class Program
+    {
+        public async static Task Main(string[] args)
+        {
+            var host = CreateHostBuilder(args).Build();
+
+            await host.RunAsync();
+        }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .UseSystemd()
+                .UseWindowsService()
+                .UseServiceProviderFactory(new AutofacServiceProviderFactory())
+                .ConfigureAppConfiguration((hostContext, config) =>
+                {
+                    var buided = config.Build();
+                    var path = buided["pathToConf"];
+                    if (!Path.IsPathRooted(path))
+                    {
+                        path = Path.GetFullPath(CrossPlatform.PathCombine(hostContext.HostingEnvironment.ContentRootPath, path));
+                    }
+                    config.SetBasePath(path);
+                    var env = hostContext.Configuration.GetValue("ENVIRONMENT", "Production");
+                    config
+                        .AddJsonFile("appsettings.json")
+                        .AddEnvironmentVariables()
+                        .AddCommandLine(args)
+                        .AddInMemoryCollection(new Dictionary<string, string>
+                            {
+                                {"pathToConf", path }
+                            }
+                        );
+                })
+                .ConfigureServices((hostContext, services) =>
+                {
+                    services.AddMemoryCache();
+                    var diHelper = new DIHelper(services);
+
+                    diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCache<>));
+                    LogNLogExtension.ConfigureLog(diHelper, "ASC.ClearEvents");
+                    services.AddHostedService<ClearEventsServiceLauncher>();
+                    diHelper.TryAdd<ClearEventsServiceLauncher>();
+                })
+                .ConfigureContainer<ContainerBuilder>((context, builder) =>
+                {
+                    builder.Register(context.Configuration, false, false);
+                });
+    }
+}