forked from ddrilling/AsbCloudServer
Merge branch 'dev' into feature/sections
This commit is contained in:
commit
b441d03d31
@ -2,6 +2,7 @@
|
||||
using System;
|
||||
using System.Linq;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using System.Diagnostics;
|
||||
|
||||
namespace AsbCloudDb
|
||||
{
|
||||
@ -12,12 +13,16 @@ namespace AsbCloudDb
|
||||
db.SetCommandTimeout(TimeSpan.FromMinutes(5));
|
||||
if (db.EnsureCreated())
|
||||
{
|
||||
Trace.TraceInformation("Creating DB");
|
||||
Console.WriteLine("Creating DB");
|
||||
db.CreateMigrationTable();
|
||||
db.WriteMigrationsInfo();
|
||||
}
|
||||
else
|
||||
{
|
||||
Trace.TraceInformation("Migrating DB");
|
||||
db.SetCommandTimeout(TimeSpan.FromMinutes(20));
|
||||
Console.WriteLine("db.Migrate()");
|
||||
db.Migrate();
|
||||
}
|
||||
}
|
||||
|
@ -38,13 +38,6 @@ namespace AsbCloudInfrastructure
|
||||
backgroundWorker.Add(MakeMemoryMonitoringWork(), TimeSpan.FromMinutes(1));
|
||||
|
||||
var notificationBackgroundWorker = provider.GetRequiredService<NotificationBackgroundWorker>();
|
||||
|
||||
Task.Delay(1_000)
|
||||
.ContinueWith(async (_) =>
|
||||
{
|
||||
await backgroundWorker.StartAsync(CancellationToken.None);
|
||||
await notificationBackgroundWorker.StartAsync(CancellationToken.None);
|
||||
});
|
||||
}
|
||||
|
||||
static Work MakeMemoryMonitoringWork()
|
||||
|
@ -81,7 +81,8 @@ namespace AsbCloudWebApi
|
||||
c.IncludeXmlComments(xmlPath, includeControllerXmlComment);
|
||||
c.IncludeXmlComments(Path.Combine(AppContext.BaseDirectory, "AsbCloudApp.xml"), includeControllerXmlComment);
|
||||
|
||||
c.AddSignalRSwaggerGen(options => {
|
||||
c.AddSignalRSwaggerGen(options =>
|
||||
{
|
||||
options.DisplayInDocument("signalr");
|
||||
options.UseHubXmlCommentsSummaryAsTagDescription = true;
|
||||
options.UseHubXmlCommentsSummaryAsTag = true;
|
||||
|
@ -7,8 +7,6 @@ namespace AsbCloudWebApi
|
||||
{
|
||||
// Uncomment next line to find wired exceptions by tracing.
|
||||
//static TraceListenerView trace4debug = new TraceListenerView();
|
||||
enum A { a = 1 << 2 }
|
||||
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
var host = CreateHostBuilder(args).Build();
|
||||
|
Loading…
Reference in New Issue
Block a user