This commit is contained in:
Kukks
2023-08-28 14:35:07 +02:00
parent 52b159813a
commit 8fb7c03825
4 changed files with 8 additions and 9 deletions

View File

@@ -13,7 +13,7 @@
<PropertyGroup>
<Product>Wabisabi Coinjoin</Product>
<Description>Allows you to integrate your btcpayserver store with coinjoins.</Description>
<Version>1.0.51</Version>
<Version>1.0.52</Version>
</PropertyGroup>
<!-- Plugin development properties -->

View File

@@ -13,6 +13,7 @@ using BTCPayServer.Services;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using NBitcoin;
using NBitcoin.RPC;
@@ -38,7 +39,7 @@ public class WabisabiCoordinatorService : PeriodicRunner
private readonly IMemoryCache _memoryCache;
private readonly WabisabiCoordinatorClientInstanceManager _instanceManager;
private readonly IHttpClientFactory _httpClientFactory;
private readonly LinkGenerator _linkGenerator;
private readonly ILogger<WabisabiCoordinatorService> _logger;
public readonly IdempotencyRequestCache IdempotencyRequestCache;
@@ -51,7 +52,7 @@ public class WabisabiCoordinatorService : PeriodicRunner
WabisabiCoordinatorClientInstanceManager instanceManager,
IHttpClientFactory httpClientFactory,
IServiceProvider serviceProvider,
LinkGenerator linkGenerator) : base(TimeSpan.FromMinutes(15))
ILogger<WabisabiCoordinatorService> logger ) : base(TimeSpan.FromMinutes(15))
{
_settingsRepository = settingsRepository;
_dataDirectories = dataDirectories;
@@ -59,7 +60,7 @@ public class WabisabiCoordinatorService : PeriodicRunner
_memoryCache = memoryCache;
_instanceManager = instanceManager;
_httpClientFactory = httpClientFactory;
_linkGenerator = linkGenerator;
_logger = logger;
_socks5HttpClientHandler = serviceProvider.GetRequiredService<Socks5HttpClientHandler>();
IdempotencyRequestCache = new(memoryCache);
}
@@ -195,6 +196,7 @@ public class WabisabiCoordinatorService : PeriodicRunner
public async Task StartCoordinator(CancellationToken cancellationToken)
{
_logger.LogInformation("Starting local coordinator");
await HostedServices.StartAllAsync(cancellationToken);
if (_instanceManager.HostedServices.TryGetValue("local", out var instance))
{

View File

@@ -1,9 +1,7 @@
@using Microsoft.AspNetCore.Mvc.TagHelpers

@using WalletWasabi.Backend.Controllers
@using Microsoft.AspNetCore.Mvc.ModelBinding
@using BTCPayServer.Plugins.Wabisabi
@model WalletWasabi.Backend.Controllers.WabisabiCoordinatorSettings
@inject WabisabiCoordinatorService WabisabiCoordinatorService
@{
Layout = "../Shared/_NavLayout.cshtml";

View File

@@ -75,7 +75,7 @@ public class WabisabiPlugin : BaseBTCPayServerPlugin
"onchain-wallet-send"));
// applicationBuilder.AddSingleton<IPayoutProcessorFactory, WabisabiPayoutProcessor>();
Logger.SetMinimumLevel(LogLevel.Warning);
Logger.SetMinimumLevel(LogLevel.Info);
Logger.SetModes(LogMode.DotNetLoggers);
@@ -136,7 +136,6 @@ public class WabisabiPlugin : BaseBTCPayServerPlugin
(WalletProvider)applicationBuilderApplicationServices.GetRequiredService<IWalletProvider>();
await walletProvider.ResetWabisabiStuckPayouts(null);
});
Logger.DotnetLogger = applicationBuilderApplicationServices.GetService<ILogger<WabisabiPlugin>>();
base.Execute(applicationBuilder, applicationBuilderApplicationServices);
}