#27 use beatpulse instead of built it from scratch as now

cloudnative-netcore · Dec 7, 2018 · 5b5d695 · 5b5d695
1 parent cd9a59d
commit 5b5d695
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 113 deletions.
diff --git a/.gitignore b/.gitignore
@@ -334,3 +334,4 @@ tools
 build
 *.deb
 **/*/*.db
+**/*/livenessdb
diff --git a/samples/BiMonetaryApi/NetCoreKit.Samples.BiMonetaryApi.csproj b/samples/BiMonetaryApi/NetCoreKit.Samples.BiMonetaryApi.csproj
@@ -6,6 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="BeatPulse" Version="3.0.0" />
+    <PackageReference Include="BeatPulse.MongoDb" Version="3.0.0" />
+    <PackageReference Include="BeatPulse.UI" Version="3.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 

diff --git a/samples/BiMonetaryApi/Program.cs b/samples/BiMonetaryApi/Program.cs
@@ -1,12 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
 
 namespace NetCoreKit.Samples.BiMonetaryApi
 {

diff --git a/samples/BiMonetaryApi/Startup.cs b/samples/BiMonetaryApi/Startup.cs
@@ -1,3 +1,4 @@
+using BeatPulse.UI;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using NetCoreKit.Infrastructure.AspNetCore.Miniservice;
@@ -8,12 +9,23 @@ public class Startup
   {
     public void ConfigureServices(IServiceCollection services)
     {
-      services.AddMongoMiniService();
+      services
+        .AddMongoMiniService()
+        .AddBeatPulse()
+        .AddBeatPulseUI();
     }
 
     public void Configure(IApplicationBuilder app)
     {
-      app.UseMiniService();
+      app
+        .UseBeatPulse(options =>
+        {
+          options.ConfigurePath(path: "healthz") //default hc
+            .ConfigureTimeout(milliseconds: 1500) // default -1 infinitely
+            .ConfigureDetailedOutput(detailedOutput: true, includeExceptionMessages: true); //default (true,false)
+        })
+        .UseBeatPulseUI()
+        .UseMiniService();
     }
   }
 }
diff --git a/samples/BiMonetaryApi/appsettings.json b/samples/BiMonetaryApi/appsettings.json
@@ -41,6 +41,17 @@
       "Audience": "api"
     }
   },
+  "BeatPulse-UI": {
+    "Liveness": [
+      {
+        "Name": "BiMonetaryApi",
+        "Uri": "http://localhost:54408/healthz"
+      }
+    ],
+    "Webhooks": [
+    ],
+    "EvaluationTimeOnSeconds": 10
+  },
   "Logging": {
     "LogLevel": {
       "Default": "Warning"

diff --git a/src/NetCoreKit.Infrastructure.AspNetCore.Miniservice/Controllers/HealthController.cs b/src/NetCoreKit.Infrastructure.AspNetCore.Miniservice/Controllers/HealthController.cs
diff --git a/src/NetCoreKit.Infrastructure.AspNetCore.Miniservice/EfCore.ServiceCollectionExtensions.cs b/src/NetCoreKit.Infrastructure.AspNetCore.Miniservice/EfCore.ServiceCollectionExtensions.cs
@@ -15,8 +15,7 @@ namespace NetCoreKit.Infrastructure.AspNetCore.Miniservice
 {
   public static partial class ServiceCollectionExtensions
   {
-    public static IServiceCollection AddEfCoreMiniService<TDbContext>(
-      this IServiceCollection services,
+    public static IServiceCollection AddEfCoreMiniService<TDbContext>(this IServiceCollection services,
       Action<IServiceCollection> preDbWorkHook = null,
       Action<IServiceCollection, IServiceProvider> postDbWorkHook = null)
       where TDbContext : DbContext
@@ -30,10 +29,8 @@ public static partial class ServiceCollectionExtensions
         var env = svcProvider.GetRequiredService<IHostingEnvironment>();
         var feature = svcProvider.GetRequiredService<IFeature>();
 
-        // let registering the database providers or others from the outside
         preDbWorkHook?.Invoke(services);
 
-        // #1
         if (feature.IsEnabled("EfCore"))
         {
           if (feature.IsEnabled("Mongo")) throw new Exception("Please turn off MongoDb settings.");
@@ -50,43 +47,32 @@ public static partial class ServiceCollectionExtensions
           services.AddGenericRepository();
         }
 
-        // let outside inject more logic (like more healthcheck endpoints...)
         postDbWorkHook?.Invoke(services, svcProvider);
 
-        // RestClient out of the box
         services.AddRestClientCore();
 
-        // DomainEventBus for handling the published event from the domain object
         services.AddSingleton<IDomainEventBus, MemoryDomainEventBus>();
 
-        // #3
         if (feature.IsEnabled("CleanArch"))
           services.AddCleanArch(config.LoadFullAssemblies());
 
         services.AddCacheCore();
 
-        // #4
         if (feature.IsEnabled("ApiVersion"))
           services.AddApiVersionCore(config);
 
-        // #5
         services.AddMvcCore(config);
 
-        // #6
         services.AddDetailExceptionCore();
 
-        // #7
         if (feature.IsEnabled("AuthN"))
           services.AddAuthNCore(config, env);
 
-        // #8
         if (feature.IsEnabled("OpenApi"))
           services.AddOpenApiCore(config, feature);
 
-        // #9
         services.AddCorsCore();
 
-        // #10
         services.AddHeaderForwardCore(env);
 
         if (feature.IsEnabled("OpenApi:Profiler"))

diff --git a/...oreKit.Infrastructure.AspNetCore.Miniservice/ExternalSystems/DbHealthCheckAndMigration.cs b/...oreKit.Infrastructure.AspNetCore.Miniservice/ExternalSystems/DbHealthCheckAndMigration.cs
diff --git a/src/NetCoreKit.Infrastructure.AspNetCore.Miniservice/Mongo.ServiceCollectionExtensions.cs b/src/NetCoreKit.Infrastructure.AspNetCore.Miniservice/Mongo.ServiceCollectionExtensions.cs
@@ -12,8 +12,7 @@ namespace NetCoreKit.Infrastructure.AspNetCore.Miniservice
 {
   public static partial class ServiceCollectionExtensions
   {
-    public static IServiceCollection AddMongoMiniService(
-      this IServiceCollection services,
+    public static IServiceCollection AddMongoMiniService(this IServiceCollection services,
       Action<IServiceCollection> preDbWorkHook = null,
       Action<IServiceCollection, IServiceProvider> postDbWorkHook = null)
     {
@@ -26,54 +25,41 @@ public static partial class ServiceCollectionExtensions
         var env = svcProvider.GetRequiredService<IHostingEnvironment>();
         var feature = svcProvider.GetRequiredService<IFeature>();
 
-        // let registering the database providers or others from the outside
         preDbWorkHook?.Invoke(services);
 
-        // #1
         if (feature.IsEnabled("Mongo"))
         {
           if (feature.IsEnabled("EfCore"))
             throw new Exception("Please turn off EfCore settings.");
           services.AddMongoDb();
         }
 
-        // let outside inject more logic (like more healthcheck endpoints...)
         postDbWorkHook?.Invoke(services, svcProvider);
 
-        // RestClient out of the box
         services.AddRestClientCore();
 
-        // DomainEventBus for handling the published event from the domain object
         services.AddSingleton<IDomainEventBus, MemoryDomainEventBus>();
 
-        // #3
         if (feature.IsEnabled("CleanArch"))
           services.AddCleanArch(config.LoadFullAssemblies());
 
         services.AddCacheCore();
 
-        // #4
         if (feature.IsEnabled("ApiVersion"))
           services.AddApiVersionCore(config);
 
-        // #5
         services.AddMvcCore(config);
 
-        // #6
         services.AddDetailExceptionCore();
 
-        // #7
         if (feature.IsEnabled("AuthN"))
           services.AddAuthNCore(config, env);
 
-        // #8
         if (feature.IsEnabled("OpenApi"))
           services.AddOpenApiCore(config, feature);
 
-        // #9
         services.AddCorsCore();
 
-        // #10
         services.AddHeaderForwardCore(env);
 
         if (feature.IsEnabled("OpenApi:Profiler"))

diff --git a/src/NetCoreKit.Infrastructure.AspNetCore.Miniservice/ServiceCollectionExtensions.cs b/src/NetCoreKit.Infrastructure.AspNetCore.Miniservice/ServiceCollectionExtensions.cs
@@ -11,8 +11,7 @@ namespace NetCoreKit.Infrastructure.AspNetCore.Miniservice
 {
   public static partial class ServiceCollectionExtensions
   {
-    public static IServiceCollection AddMiniService(
-      this IServiceCollection services,
+    public static IServiceCollection AddMiniService(this IServiceCollection services,
       Action<IServiceCollection, IServiceProvider> preHook = null)
     {
       services.AddFeatureToggle();
@@ -24,43 +23,32 @@ public static partial class ServiceCollectionExtensions
         var env = svcProvider.GetRequiredService<IHostingEnvironment>();
         var feature = svcProvider.GetRequiredService<IFeature>();
 
-        // let registering the database providers or others from the outside
         preHook?.Invoke(services, svcProvider);
 
-        // RestClient out of the box
         services.AddRestClientCore();
 
-        // DomainEventBus for handling the published event from the domain object
         services.AddSingleton<IDomainEventBus, MemoryDomainEventBus>();
 
-        // #3
         if (feature.IsEnabled("CleanArch"))
           services.AddCleanArch(config.LoadFullAssemblies());
 
         services.AddCacheCore();
 
-        // #4
         if (feature.IsEnabled("ApiVersion"))
           services.AddApiVersionCore(config);
 
-        // #5
         services.AddMvcCore(config);
 
-        // #6
         services.AddDetailExceptionCore();
 
-        // #7
         if (feature.IsEnabled("AuthN"))
           services.AddAuthNCore(config, env);
 
-        // #8
         if (feature.IsEnabled("OpenApi"))
           services.AddOpenApiCore(config, feature);
 
-        // #9
         services.AddCorsCore();
 
-        // #10
         services.AddHeaderForwardCore(env);
 
         if (feature.IsEnabled("OpenApi:Profiler"))