Skip to content

Commit 93b8fdf

Browse files
committed
Tentacle changes to accommodate changes in Halibut
1 parent 990e193 commit 93b8fdf

File tree

5 files changed

+15
-2
lines changed

5 files changed

+15
-2
lines changed

NuGet.Config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
<add key="NuGet.org" value="https://www.nuget.org/api/v2/" />
99
<add key="feedz.io" value="https://f.feedz.io/octopus-deploy/dependencies/nuget" />
1010
<add key="nuget.packages.octopushq.com" value="https://nuget.packages.octopushq.com/" />
11+
<add key="Local" value="C:\Code\LocalPackages" allowInsecureConnections="True" />
1112
</packageSources>
1213
</configuration>

source/Octopus.Tentacle.Contracts/Octopus.Tentacle.Contracts.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</Otherwise>
2929
</Choose>
3030
<ItemGroup>
31-
<PackageReference Include="Halibut" Version="8.0.1075-pull-633" />
31+
<PackageReference Include="Halibut" Version="8.1.1200-pull-633" />
3232
</ItemGroup>
3333
<ItemGroup>
3434
<Compile Include="..\Solution Items\SolutionInfo.cs">

source/Octopus.Tentacle.Tests.Integration/Support/PendingRequestQueueFactories/CancelWhenRequestQueuedPendingRequestQueueFactory.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ public IPendingRequestQueue CreateQueue(Uri endpoint)
2929
return new Decorator(new PendingRequestQueueAsync(halibutTimeoutsAndLimits, new LogFactory().ForEndpoint(endpoint)), cancellationTokenSource, shouldCancel);
3030
}
3131

32+
public Task<IPendingRequestQueue> CreateQueueAsync(Uri endpoint, CancellationToken cancellationToken)
33+
{
34+
return Task.FromResult(CreateQueue(endpoint));
35+
}
36+
3237
class Decorator : IPendingRequestQueue
3338
{
3439
readonly CancellationTokenSource cancellationTokenSource;

source/Octopus.Tentacle.Tests.Integration/Util/PendingRequestQueueHelpers/CancellationObservingPendingRequestQueueFactory.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
using System;
2+
using System.Threading;
3+
using System.Threading.Tasks;
24
using Halibut.Diagnostics;
35
using Halibut.ServiceModel;
46
using Octopus.Tentacle.Tests.Integration.Support;
@@ -11,5 +13,10 @@ public IPendingRequestQueue CreateQueue(Uri endpoint)
1113
{
1214
return new CancellationTokenObservingPendingRequestQueueDecorator(new PendingRequestQueueAsync(new HalibutTimeoutsAndLimitsForTestBuilder().Build(), new LogFactory().ForEndpoint(endpoint)));
1315
}
16+
17+
public Task<IPendingRequestQueue> CreateQueueAsync(Uri endpoint, CancellationToken cancellationToken)
18+
{
19+
return Task.FromResult(CreateQueue(endpoint));
20+
}
1421
}
1522
}

source/Octopus.Tentacle/Tentacle.exe.nlog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<variable name="appName" value="Octopus Tentacle" />
1515
<variable name="messageLayout" value="${message}${onexception:${newline}${exception:format=ToString}}"/>
1616
<variable name="normalLayout" value="${longdate} ${processid:padding=5} ${threadid:padding=5} ${uppercase:${level}:padding=5} ${messageLayout}"/>
17-
<variable name="logLevel" value="Info" />
17+
<variable name="logLevel" value="Trace" />
1818

1919
<targets async="false">
2020
<target xsi:type="ColoredConsole" name="stdout" layout="${messageLayout}" />

0 commit comments

Comments
 (0)