Merge branch 'develop'

EvilBeaver · Aug 23, 2021 · 79ccf83 · 79ccf83
2 parents 6330667 + 946bf92
commit 79ccf83
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -3,7 +3,7 @@ pipeline {
 	agent none
 
 	environment {
-        ReleaseNumber = '0.9.0'
+        ReleaseNumber = '0.9.1'
     }
 	stages {
 

diff --git a/src/OneScript/Database/DatabaseExtensions.cs b/src/OneScript/Database/DatabaseExtensions.cs
@@ -10,7 +10,9 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using OneScript.WebHost.Application;
 using OneScript.WebHost.Infrastructure;
 using ScriptEngine;
 
@@ -22,9 +24,6 @@ public static class DatabaseExtensions
 
         public static void AddDatabaseByConfiguration(this IServiceCollection services, IConfiguration config)
         {
-            if (!config.GetChildren().Any(item => item.Key == ConfigSectionName))
-                return;
-
             var dbSettings = config.GetSection(ConfigSectionName);
 
             // Делаем доступным для прочих частей приложения
@@ -70,9 +69,11 @@ private static DbContextOptions<ApplicationDbContext> ConfigureDbOptions(IServic
 
         public static void PrepareDbEnvironment(IServiceProvider services, RuntimeEnvironment environment)
         {
+            var logger = services.GetService<ILogger<ApplicationInstance>>();
             var dbOptions = services.GetService<IOptions<OscriptDbOptions>>().Value;
             if (dbOptions != null && dbOptions.DbType != SupportedDatabase.Unknown)
             {
+                logger.LogDebug($"Database enabled: {dbOptions.DbType}");
                 var dbctx = services.GetService<ApplicationDbContext>();
                 dbctx.Database.EnsureCreated();
 
@@ -86,6 +87,10 @@ public static void PrepareDbEnvironment(IServiceProvider services, RuntimeEnviro
                 environment.InjectGlobalProperty(ib, "ИнформационнаяБаза", true);
                 environment.InjectGlobalProperty(ib, "InfoBase", true);
             }
+            else
+            {
+                logger.LogDebug("No database configured");
+            }
         }
     }
 

diff --git a/src/OneScript/Program.cs b/src/OneScript/Program.cs
@@ -56,7 +56,11 @@ public static void Main(string[] args)
             var options = ConfigureHostingMode(builder, configInstance);
 
             builder.UseConfiguration(configInstance)
-                .UseKestrel(opts => opts.AllowSynchronousIO = true)
+                .UseKestrel(opts =>
+                {
+                    configInstance.Bind("Kestrel", opts);
+                    opts.AllowSynchronousIO = true;
+                })
                 .UseIISIntegration()
                 .UseStartup<Startup>()
                 .UseApplicationInsights()