fix plugin logger and don't create handler when endpoints is zero

vbilopav · vbilopav · commit 106749f75340 · 2024-03-25T13:25:39.000+01:00
diff --git a/NpgsqlRest/MiddlewareExtension.cs b/NpgsqlRest/MiddlewareExtension.cs
@@ -51,6 +51,11 @@ public static IApplicationBuilder UseNpgsqlRest(this IApplicationBuilder builder
         var dict = BuildDictionary(builder, options, logger);
         var serviceProvider = builder.ApplicationServices;
 
+        if (dict.Count == 0)
+        {
+            return builder;
+        }
+
         builder.Use(async (context, next) =>
         {
             var path = context.Request.Path.ToString();
diff --git a/NpgsqlRestTestWebApi/appsettings.Development.json b/NpgsqlRestTestWebApi/appsettings.Development.json
@@ -1,5 +1,5 @@
 {
   "ConnectionStrings": {
-    "Default": "Host=127.0.0.1;Port=5432;Database=npgsql_rest_test;Username=postgres;Password=postgres"
+    //"Default": "Host=127.0.0.1;Port=5432;Database=npgsql_rest_test;Username=postgres;Password=postgres"
   }
 }
diff --git a/NpgsqlRestTestWebApi/npgsql_rest_test.http b/NpgsqlRestTestWebApi/npgsql_rest_test.http
@@ -108,6 +108,17 @@ GET {{host}}/api/case-get-int-params-array?a=1&a=2&a=3
 
 ###
 
+// function public.case_get_long_table1(
+//     _records integer
+// )
+// returns table(
+//     int_field integer,
+//     text_field text
+// )
+GET {{host}}/api/case-get-long-table1?records=1
+
+###
+
 // function public.case_get_multi_params1(
 //     _smallint smallint,
 //     _integer integer,
diff --git a/plugins/NpgsqlRest.HttpFiles/HttpFile.cs b/plugins/NpgsqlRest.HttpFiles/HttpFile.cs
@@ -1,5 +1,4 @@
 ﻿using System.Text;
-using Microsoft.Extensions.Options;
 using Npgsql;
 
 namespace NpgsqlRest.HttpFiles;
@@ -19,8 +18,23 @@ public HttpFile() : this (new HttpFileOptions()) { }
     
     public void Setup(IApplicationBuilder builder, ILogger? logger, NpgsqlRestOptions options)
     {
+        if (builder is WebApplication app)
+        {
+            var factory = app.Services.GetRequiredService<ILoggerFactory>();
+            if (factory is not null)
+            {
+                _logger = factory.CreateLogger(options.LoggerName ?? typeof(HttpFile).Namespace ?? "NpgsqlRest.HttpFiles");
+            }
+            else
+            {
+                _logger = app.Logger;
+            }
+        }
+        else
+        {
+            _logger = logger;
+        }
         _builder = builder;
-        _logger = logger;
     }
 
     public void Handle(Routine routine, RoutineEndpoint endpoint)
diff --git a/plugins/NpgsqlRest.TsClient/TsClient.cs b/plugins/NpgsqlRest.TsClient/TsClient.cs
@@ -12,8 +12,23 @@ public TsClient(string filePath) : this(new TsClientOptions(filePath)) { }
 
     public void Setup(IApplicationBuilder builder, ILogger? logger, NpgsqlRestOptions options)
     {
+        if (builder is WebApplication app)
+        {
+            var factory = app.Services.GetRequiredService<ILoggerFactory>();
+            if (factory is not null)
+            {
+                _logger = factory.CreateLogger(options.LoggerName ?? typeof(TsClient).Namespace ?? "NpgsqlRest.HttpFiles");
+            }
+            else
+            {
+                _logger = app.Logger;
+            }
+        }
+        else
+        {
+            _logger = logger;
+        }
         _builder = builder;
-        _logger = logger;
         _npgsqlRestoptions = options;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"ConnectionStrings": {`
`3`		`- "Default": "Host=127.0.0.1;Port=5432;Database=npgsql_rest_test;Username=postgres;Password=postgres"`
	`3`	`+ //"Default": "Host=127.0.0.1;Port=5432;Database=npgsql_rest_test;Username=postgres;Password=postgres"`
`4`	`4`	`}`
`5`	`5`	`}`