aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-18 22:44:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

do not crash if cookiefile invalid

Browse Source
This commit is contained in:
NicolasDorier
2017-09-15 01:03:27 +09:00
parent a3ea94c771
commit efcda9a45e
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BTCPayServer/BTCPayServer.csproj
View File

@@ -11,10 +11,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
<PackageReference Include="NBitcoin" Version="4.0.0.34" /> <PackageReference Include="NBitcoin" Version="4.0.0.38" />
<PackageReference Include="NBitpayClient" Version="1.0.0.6" /> <PackageReference Include="NBitpayClient" Version="1.0.0.6" />
<PackageReference Include="DBreeze" Version="1.87.0" /> <PackageReference Include="DBreeze" Version="1.87.0" />
<PackageReference Include="NBXplorer.Client" Version="1.0.0.7" /> <PackageReference Include="NBXplorer.Client" Version="1.0.0.9" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" /> <PackageReference Include="System.ValueTuple" Version="4.4.0" />
<PackageReference Include="System.Xml.XmlSerializer" Version="4.0.11" /> <PackageReference Include="System.Xml.XmlSerializer" Version="4.0.11" />
</ItemGroup> </ItemGroup>

9
BTCPayServer/Configuration/BTCPayServerRuntime.cs
View File

@@ -34,8 +34,11 @@ namespace BTCPayServer.Configuration
{ {
Network = opts.Network; Network = opts.Network;
Explorer = new ExplorerClient(opts.Network, opts.Explorer); Explorer = new ExplorerClient(opts.Network, opts.Explorer);
Explorer.SetCookieFile(opts.CookieFile);
CancellationTokenSource cts = new CancellationTokenSource(5000); if(!Explorer.SetCookieAuth(opts.CookieFile))
Explorer.SetNoAuth();
CancellationTokenSource cts = new CancellationTokenSource(10000);
try try
{ {
Logs.Configuration.LogInformation("Trying to connect to explorer " + Explorer.Address.AbsoluteUri); Logs.Configuration.LogInformation("Trying to connect to explorer " + Explorer.Address.AbsoluteUri);
@@ -84,7 +87,7 @@ namespace BTCPayServer.Configuration
_Resources.Clear(); _Resources.Clear();
} }
} }
public Network Network public Network Network
{ {
get; get;