Fix logging leak

src/Data/Repositories/ChannelRepository.cs

@@ -236,6 +236,21 @@ public async Task<List<Channel>> GetAllManagedByUserNodes(string loggedUserId)
             }
 
             var channels = await _lightningClientService.ListChannels(channelOperationRequest.SourceNode);
+            Node managedNode;
+
+            //If the source is not a managed node lets take the destination
+            if (channelOperationRequest.SourceNode.IsManaged)
+                managedNode = channelOperationRequest.SourceNode;
+            else
+                managedNode = channelOperationRequest.DestNode;
+
+            if (managedNode == null)
+            {
+                _logger.LogError(
+                    "Error while marking as closed with id: {ChannelId}. No managed node found",
+                    channel.Id);
+                return (false, "No managed node found");
+            }
 
             if (channels == null)
             {

src/Jobs/NodeChannelSubscribeJob.cs

@@ -80,7 +80,7 @@ public async Task Execute(IJobExecutionContext context)
                 {
                     var channelEventUpdate = result.ResponseStream.Current;
                     _logger.LogInformation("Channel event update received for node {@NodeId}", node.Id);
-                    NodeUpdateManagement(channelEventUpdate, node);
+                    await NodeUpdateManagement(channelEventUpdate, node);
                 }
                 catch (Exception e)
                 {

src/Jobs/ProcessNodeChannelAcceptorJob.cs

@@ -60,9 +60,6 @@ public async Task Execute(IJobExecutionContext context)
         var managedNodeId = context.JobDetail.JobDataMap.GetIntValueFromString("managedNodeId");
 
         if (managedNodeId <= 0) throw new JobExecutionException(new Exception("Invalid managedNodeId"), false);
-
-        var loggerFactory = GRPCLoggerFactoryHelper.LoggerFactory();
-
         #region Local Functions
 
         async Task AcceptChannelOpeningRequest(

src/Jobs/SweepNodeWalletsJob.cs

@@ -32,21 +32,24 @@ namespace NodeGuard.Jobs;
 [DisallowConcurrentExecution]
 public class SweepNodeWalletsJob : IJob
 {
+    private readonly ILightningClientService _lightningClientService;
     private readonly ILogger<SweepNodeWalletsJob> _logger;
     private readonly INodeRepository _nodeRepository;
     private readonly IWalletRepository _walletRepository;
     private readonly INBXplorerService _nbXplorerService;
 
     public SweepNodeWalletsJob(ILogger<SweepNodeWalletsJob> logger,
-        INodeRepository _nodeRepository,
+        INodeRepository nodeRepository,
         IWalletRepository walletRepository,
-        INBXplorerService nbXplorerService
-    )
+        INBXplorerService nbXplorerService,
+        ILightningClientService lightningClientService)
     {
+
         _logger = logger;
-        this._nodeRepository = _nodeRepository;
+        _nodeRepository = nodeRepository;
         _walletRepository = walletRepository;
         _nbXplorerService = nbXplorerService;
+        _lightningClientService = lightningClientService;
     }
 
     public async Task Execute(IJobExecutionContext context)
@@ -150,23 +153,13 @@ async Task SweepFunds(Node node, Wallet wallet, Lightning.LightningClient lightn
             return;
         }
 
-        var loggerFactory = GRPCLoggerFactoryHelper.LoggerFactory();
+
 
         try
         {
-            using var grpcChannel = GrpcChannel.ForAddress($"https://{node.Endpoint}",
-                new GrpcChannelOptions
-                {
-                    HttpHandler = new HttpClientHandler
-                    {
-                        ServerCertificateCustomValidationCallback =
-                            HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
-                    },
-                    LoggerFactory = loggerFactory,
-                });
-
-            var client = new Lightning.LightningClient(grpcChannel);
-
+
+            var client = _lightningClientService.GetLightningClient(node.Endpoint);
+
             var unspentResponse = await client.ListUnspentAsync(new ListUnspentRequest { MinConfs = 1, MaxConfs = Int32.MaxValue }, new Metadata
             {
                 {

src/NodeGuard.csproj

@@ -23,7 +23,7 @@
     <PackageReference Include="Blazorise.Bootstrap" Version="1.2.4" />
     <PackageReference Include="Blazorise.Components" Version="1.2.4" />
     <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.2.4" />
-    <PackageReference Include="Grpc.AspNetCore" Version="2.55.0" />
+    <PackageReference Include="Grpc.AspNetCore" Version="2.59.0" />
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="7.0.14" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.9" />
@@ -33,6 +33,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="7.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.8" />
     <PackageReference Include="Moq.EntityFrameworkCore" Version="7.0.0.2" />
     <PackageReference Include="NBitcoin" Version="7.0.30" />
@@ -48,14 +49,15 @@
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.5.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.5.1-beta.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.7" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Quartz" Version="1.0.0-alpha.3" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.5.0" />
-    <PackageReference Include="Quartz" Version="3.6.3" />
-    <PackageReference Include="Quartz.AspNetCore" Version="3.6.3" />
-    <PackageReference Include="Quartz.Serialization.Json" Version="3.6.3" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.5.1" />
+    <PackageReference Include="Quartz" Version="3.8.0" />
+    <PackageReference Include="Quartz.AspNetCore" Version="3.8.0" />
+    <PackageReference Include="Quartz.Serialization.Json" Version="3.8.0" />
     <PackageReference Include="Blazorise.SpinKit" Version="1.2.4" />
     <PackageReference Include="RestSharp" Version="106.13.0" />
+    <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
   </ItemGroup>
 
   <ItemGroup>

src/Program.cs

@@ -65,11 +65,10 @@ public static void Main(string[] args)
                 .Enrich.With(new DatadogLogEnricher())
                 .WriteTo.Console(jsonFormatter)
                 .CreateLogger();
+
+            builder.Host.UseSerilog();
 
-            builder.Logging.ClearProviders();
-            builder.Logging.AddSerilog(Log.Logger);
-
-            // Add services to the container.
+            //Add services to the container.
 
             builder.Services.AddDatabaseDeveloperPageExceptionFilter();
 
@@ -194,7 +193,7 @@ public static void Main(string[] args)
                     options.UseJsonSerializer();
                 });
 
-                q.UseDedicatedThreadPool(x => { x.MaxConcurrency = 500; });
+                q.UseDefaultThreadPool(x => { x.MaxConcurrency = 100; });
 
                 //This allows DI in jobs
                 q.UseMicrosoftDependencyInjectionJobFactory();
@@ -294,7 +293,6 @@ public static void Main(string[] args)
                             options.Endpoint = new Uri(Constants.OTEL_EXPORTER_ENDPOINT);
                         })
                         .AddEntityFrameworkCoreInstrumentation()
-                        .AddQuartzInstrumentation()
                     );
             }
 
@@ -347,6 +345,9 @@ public static void Main(string[] args)
             //TODO Auth in the future, DAPR(?)
             app.MapGrpcService<NodeGuardService>();
 
+            var loggerFactory = new LoggerFactory()
+                .AddSerilog(Log.Logger);
+            Quartz.Logging.LogContext.SetCurrentLogProvider(loggerFactory);
             app.Run();
         }
     }

src/Services/LightningClientService.cs

@@ -22,6 +22,7 @@
 using Grpc.Core;
 using Grpc.Net.Client;
 using Lnrpc;
+using Microsoft.Extensions.Logging.Abstractions;
 using NBitcoin;
 using NodeGuard.Data.Models;
 using NodeGuard.Helpers;
@@ -53,7 +54,7 @@ public LightningClientService(ILogger<LightningClientService> logger)
         _logger = logger;
     }
 
-    private static GrpcChannel CreateLightningClient(string? endpoint)
+    private GrpcChannel CreateLightningClient(string? endpoint)
     {
         //Setup of grpc lnd api client (Lightning.proto)
         //Hack to allow self-signed https grpc calls
@@ -64,7 +65,11 @@ private static GrpcChannel CreateLightningClient(string? endpoint)
         };
 
         var grpcChannel = GrpcChannel.ForAddress($"https://{endpoint}",
-            new GrpcChannelOptions { HttpHandler = httpHandler });
+            new GrpcChannelOptions
+                {HttpHandler = httpHandler, LoggerFactory = NullLoggerFactory.Instance});
+
+
+        _logger.LogInformation("New grpc channel created for endpoint {endpoint}", endpoint);
 
         return grpcChannel;
     }

test/NodeGuard.Tests/NodeGuard.Tests.csproj

@@ -10,9 +10,10 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Grpc.Core.Api" Version="2.55.0" />
+    <PackageReference Include="Grpc.Core.Api" Version="2.59.0" />
     <PackageReference Include="Grpc.Core.Testing" Version="2.46.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="7.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="Moq.EntityFrameworkCore" Version="7.0.0.2" />