ImapSync renamed to ImapSyncService

ASC.Mail.sln

@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Mail.Core", "Core\ASC.M
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Mail.Aggregator.Service", "Services\ASC.Mail.Aggregator.Service\ASC.Mail.Aggregator.Service.csproj", "{3FB12384-EFDF-4069-B625-61D13552A630}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Mail.ImapSync", "Services\ASC.Mail.ImapSync\ASC.Mail.ImapSync.csproj", "{5D982C73-D484-43B6-91C3-C763AF7FBC03}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Mail.ImapSync.Service", "Services\ASC.Mail.ImapSync.Service\ASC.Mail.ImapSync.Service.csproj", "{5D982C73-D484-43B6-91C3-C763AF7FBC03}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Mail.StorageCleaner.Service", "Services\ASC.Mail.StorageCleaner.Service\ASC.Mail.StorageCleaner.Service.csproj", "{A7B69BF5-8998-4B10-A6F7-F0E8CA04EFAD}"
 EndProject

Core/Extensions/MailHostExtensions.cs

@@ -1,4 +1,5 @@
 using ASC.Api.Core.Core;
+using ASC.Api.Core.Extensions;
 using ASC.Common.Logging;
 using ASC.Core.Common.EF.Context;
 using ASC.MessagingSystem.EF.Context;
@@ -41,6 +42,12 @@ namespace ASC.Mail.Core.Extensions
             services.AddBaseDbContextPool<MessagesContext>();
             services.RegisterFeature();
 
+            services.AddBaseDbContext<MailServerDbContext>();
+            services.AddBaseDbContext<MailDbContext>();
+            services.AddHttpClient();
+            services.AddMemoryCache();
+            services.AddDistributedTaskQueue();
+
             services.AddAutoMapper(GetAutoMapperProfileAssemblies());
         }
 

Services/ASC.Mail.Aggregator.Service/Program.cs

@@ -4,7 +4,7 @@ using StackExchange.Redis.Extensions.Core.Configuration;
 using StackExchange.Redis.Extensions.Newtonsoft;
 
 string Namespace = typeof(AggregatorService).Namespace;
-string AppName = Namespace.Substring(Namespace.LastIndexOf('.') + 1);
+string AppName = Namespace.Substring("ASC.Mail".Length + 1);
 
 var options = new WebApplicationOptions
 {
@@ -13,6 +13,7 @@ var options = new WebApplicationOptions
 };
 
 var builder = WebApplication.CreateBuilder(options);
+var diHelper = new DIHelper(builder.Services);
 
 var path = builder.Configuration["pathToConf"];
 
@@ -45,7 +46,6 @@ var logger = LogManager.Setup()
 logger.Debug("path: " + path);
 logger.Debug("EnvironmentName: " + builder.Environment.EnvironmentName);
 
-var diHelper = new DIHelper(builder.Services);
 
 diHelper.TryAdd<FactoryIndexerMailMail>();
 diHelper.TryAdd<FactoryIndexerMailContact>();
@@ -57,19 +57,17 @@ diHelper.AddMailScoppedServices();
 builder.WebHost.MailConfigureKestrel();
 builder.Host.ConfigureDefault();
 
-builder.Services.AddMailServices();
 builder.Services.AddBaseDbContext<MailServerDbContext>();
 builder.Services.AddBaseDbContext<MailDbContext>();
 builder.Services.AddDistributedTaskQueue();
 builder.Services.AddDistributedCache(builder.Configuration);
-builder.Services.AddHttpClient();
-builder.Services.AddMemoryCache();
 builder.Services.AddSingleton(new ConsoleParser(args));
 builder.Services.AddHostedService<AggregatorServiceLauncher>();
 builder.Services.Configure<HostOptions>(opts => opts.ShutdownTimeout = TimeSpan.FromSeconds(15));
 
 var redisConfiguration = builder.Configuration.GetSection("mail:ImapSync:Redis").Get<RedisConfiguration>();
 builder.Services.AddStackExchangeRedisExtensions<NewtonsoftSerializer>(redisConfiguration);
+builder.Services.AddMailServices();
 
 var app = builder.Build();
 

Services/ASC.Mail.ImapSync.Service/Program.cs

@@ -1,7 +1,7 @@
 using NLog;
 
 string Namespace = typeof(ImapSyncService).Namespace;
-string AppName = Namespace.Substring(Namespace.LastIndexOf('.') + 1);
+string AppName = Namespace.Substring("ASC.Mail".Length + 1);
 
 var options = new WebApplicationOptions
 {
@@ -43,29 +43,24 @@ var logger = LogManager.Setup()
 logger.Debug("path: " + path);
 logger.Debug("EnvironmentName: " + builder.Environment.EnvironmentName);
 
-builder.WebHost.MailConfigureKestrel();
 builder.Host.ConfigureDefault();
+builder.WebHost.MailConfigureKestrel();
 
-builder.Services.AddMailServices();
-builder.Services.AddBaseDbContext<MailServerDbContext>();
-builder.Services.AddBaseDbContext<MailDbContext>();
-builder.Services.AddDistributedTaskQueue();
 builder.Services.AddDistributedCache(builder.Configuration);
-builder.Services.AddHttpClient();
-builder.Services.AddMemoryCache();
 
+diHelper.AddMailScoppedServices();
 diHelper.TryAdd<FactoryIndexerMailMail>();
 diHelper.TryAdd<FactoryIndexerMailContact>();
 diHelper.TryAdd(typeof(ICacheNotify<>), typeof(RedisCacheNotify<>));
 diHelper.TryAdd<ImapSyncService>();
 diHelper.TryAdd<MailEnginesFactory>();
-diHelper.AddMailScoppedServices();
 
 var redisConfiguration = builder.Configuration.GetSection("mail:ImapSync:Redis").Get<RedisConfiguration>();
 builder.Services.AddStackExchangeRedisExtensions<NewtonsoftSerializer>(redisConfiguration);
 
 builder.Services.AddHostedService<ImapSyncService>();
 builder.Services.Configure<HostOptions>(opts => opts.ShutdownTimeout = TimeSpan.FromSeconds(15));
+builder.Services.AddMailServices();
 
 var app = builder.Build();
 

Services/ASC.Mail.StorageCleaner.Service/ASC.Mail.StorageCleaner.Service.csproj

@@ -18,6 +18,7 @@
 	<ItemGroup>
 		<PackageReference Include="Amazon.Extensions.S3.Encryption" Version="2.0.3" />
 		<PackageReference Include="AppLimit.CloudComputing.SharpBox" Version="1.2.0.542" />
+		<PackageReference Include="AWS.Logger.NLog" Version="3.1.0" />
 		<PackageReference Include="CommandLineParser" Version="2.9.1" />
 		<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="7.0.0" />
 		<PackageReference Include="MySql.Data" Version="8.0.32" />
@@ -32,6 +33,7 @@
 		<PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
 		<PackageReference Include="protobuf-net" Version="3.1.26" />
 		<PackageReference Include="Microsoft.SharePoint.Client" Version="14.0.4762.1000" />
+		<PackageReference Include="System.ServiceModel.Primitives" Version="4.10.0" />
 	</ItemGroup>
 
 	<ItemGroup>

Services/ASC.Mail.StorageCleaner.Service/Program.cs

@@ -1,7 +1,10 @@
-using NLog;
+using ASC.Core.Common.EF;
+using ASC.Mail.Core.Dao.Context;
+using ASC.Mail.Server.Core.Dao;
+using NLog;
 
 string Namespace = typeof(StorageCleanerService).Namespace;
-string AppName = Namespace.Substring(Namespace.LastIndexOf('.') + 1);
+string AppName = Namespace.Substring("ASC.Mail".Length + 1);
 
 var options = new WebApplicationOptions
 {
@@ -10,8 +13,7 @@ var options = new WebApplicationOptions
 };
 
 var builder = WebApplication.CreateBuilder(options);
-
-builder.WebHost.MailConfigureKestrel();
+var diHelper = new DIHelper(builder.Services);
 
 var path = builder.Configuration["pathToConf"];
 
@@ -45,28 +47,19 @@ logger.Debug("path: " + path);
 logger.Debug("EnvironmentName: " + builder.Environment.EnvironmentName);
 
 builder.Host.ConfigureDefault();
+builder.WebHost.MailConfigureKestrel();
 
-builder.Services.AddMailServices();
-builder.Services.AddDistributedTaskQueue();
-
-var diHelper = new DIHelper(builder.Services);
-
-builder.Services.AddMailServices();
-builder.Services.AddDistributedTaskQueue();
-builder.Services.AddDistributedCache(builder.Configuration);
 diHelper.AddMailScoppedServices();
+builder.Services.AddBaseDbContext<MailServerDbContext>();
+builder.Services.AddBaseDbContext<MailDbContext>();
+
 diHelper.TryAdd<StorageCleanerLauncher>();
 builder.Services.AddHostedService<StorageCleanerLauncher>();
 diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCacheNotify<>));
 diHelper.TryAdd<StorageCleanerScope>();
-builder.Services.AddAutoMapper(Assembly.GetAssembly(typeof(DefaultMappingProfile)));
+builder.Services.AddSingleton(new ConsoleParser(args));
 builder.Services.Configure<HostOptions>(opts => opts.ShutdownTimeout = TimeSpan.FromSeconds(15));
-
-
-builder.Host.ConfigureContainer<ContainerBuilder>((context, builder) =>
-{
-    builder.Register(context.Configuration, false, false);
-});
+builder.Services.AddMailServices();
 
 var app = builder.Build();
 

Services/ASC.Mail.Watchdog.Service/ASC.Mail.Watchdog.Service.csproj

@@ -18,10 +18,12 @@
 	<ItemGroup>
 		<PackageReference Include="Amazon.Extensions.S3.Encryption" Version="2.0.3" />
 		<PackageReference Include="AppLimit.CloudComputing.SharpBox" Version="1.2.0.542" />
+		<PackageReference Include="AWS.Logger.NLog" Version="3.1.0" />
 		<PackageReference Include="CommandLineParser" Version="2.9.1" />
 		<PackageReference Include="MySql.Data" Version="8.0.32" />
 		<PackageReference Include="NLog.Web.AspNetCore" Version="5.2.1" />
 		<PackageReference Include="SixLabors.ImageSharp" Version="2.0.0" />
+		<PackageReference Include="System.ServiceModel.Primitives" Version="4.10.0" />
 		<PackageReference Include="Ubiety.Dns.Core" Version="4.2.2" />
 		<PackageReference Include="Confluent.Kafka" Version="2.0.2" />
 		<PackageReference Include="AspNetCore.HealthChecks.Elasticsearch" Version="6.0.2" />

Services/ASC.Mail.Watchdog.Service/Program.cs

@@ -1,7 +1,7 @@
 using NLog;
 
 string Namespace = typeof(WatchdogService).Namespace;
-string AppName = Namespace.Substring(Namespace.LastIndexOf('.') + 1);
+string AppName = Namespace.Substring("ASC.Mail".Length + 1);
 
 var options = new WebApplicationOptions
 {
@@ -32,8 +32,7 @@ builder.Configuration
         }
     ).Build();
 
-var logger = LogManager.Setup()
-                            .SetupExtensions(s =>
+var logger = LogManager.Setup().SetupExtensions(s =>
                             {
                                 s.RegisterLayoutRenderer("application-context", (logevent) => AppName);
                             })
@@ -43,26 +42,16 @@ var logger = LogManager.Setup()
 logger.Debug("path: " + path);
 logger.Debug("EnvironmentName: " + builder.Environment.EnvironmentName);
 
+builder.Host.ConfigureDefault();
 builder.WebHost.MailConfigureKestrel();
 
-builder.Host.ConfigureDefault();
-
-builder.Services.AddMailServices();
-builder.Services.AddDistributedTaskQueue();
-builder.Services.AddDistributedCache(builder.Configuration);
 diHelper.AddMailScoppedServices();
-builder.Services.AddBaseDbContext<MailServerDbContext>();
-builder.Services.AddBaseDbContext<MailDbContext>();
-
-builder.Services.AddHttpClient();
-builder.Services.AddMemoryCache();
-
 diHelper.TryAdd<WatchdogLauncher>();
 builder.Services.AddHostedService<WatchdogLauncher>();
 diHelper.TryAdd(typeof(ICacheNotify<>), typeof(KafkaCacheNotify<>));
 builder.Services.AddSingleton(new ConsoleParser(args));
-builder.Services.AddAutoMapper(BaseStartup.GetAutoMapperProfileAssemblies());
 builder.Services.Configure<HostOptions>(opts => opts.ShutdownTimeout = TimeSpan.FromSeconds(15));
+builder.Services.AddMailServices();
 
 var app = builder.Build();