IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Maksim Chegulov 2022-03-22 15:46:13 +03:00
parent 65b6bf9141
commit f4c75f91f4
2 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/ASC.Api.Core/GlobalUsings.cs
View File

@ -68,7 +68,8 @@ global using Microsoft.AspNetCore.Routing.Patterns;
global using Microsoft.Extensions.Configuration;
global using Microsoft.Extensions.DependencyInjection;
global using Microsoft.Extensions.Diagnostics.HealthChecks;
global using Microsoft.Extensions.Hosting;
global using Microsoft.Extensions.Hosting;
global using Microsoft.Extensions.Hosting.WindowsServices;
global using Microsoft.Extensions.Logging;
global using Microsoft.Extensions.Options;
global using Microsoft.Extensions.Primitives;

46
web/ASC.Web.Studio/Program.cs
View File

@ -12,54 +12,10 @@ builder.Host.UseWindowsService();
builder.Host.UseSystemd();
builder.Host.UseServiceProviderFactory(new AutofacServiceProviderFactory());
builder.WebHost.ConfigureKestrel((hostingContext, serverOptions) =>
{
var kestrelConfig = hostingContext.Configuration.GetSection("Kestrel");
if (!kestrelConfig.Exists()) return;
var unixSocket = kestrelConfig.GetValue<string>("ListenUnixSocket");
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
if (!string.IsNullOrWhiteSpace(unixSocket))
{
unixSocket = string.Format(unixSocket, hostingContext.HostingEnvironment.ApplicationName.Replace("ASC.", "").Replace(".", ""));
serverOptions.ListenUnixSocket(unixSocket);
}
}
});
builder.WebHost.ConfigureDefaultKestrel();
builder.Host.ConfigureDefaultAppConfiguration(args);
//builder.Host.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);
// config
// .AddJsonFile("appsettings.json")
// .AddJsonFile($"appsettings.{hostContext.HostingEnvironment.EnvironmentName}.json", true)
// .AddJsonFile("storage.json")
// .AddJsonFile("kafka.json")
// .AddJsonFile($"kafka.{hostContext.HostingEnvironment.EnvironmentName}.json", true)
// .AddJsonFile("redis.json")
// .AddJsonFile($"redis.{hostContext.HostingEnvironment.EnvironmentName}.json", true)
// .AddEnvironmentVariables()
// .AddCommandLine(args)
// .AddInMemoryCollection(new Dictionary<string, string>
// {
// {"pathToConf", path }
// }
// );
//});
builder.Host.ConfigureNLogLogging();
var startup = new Startup(builder.Configuration, builder.Environment);