Skip to content

Update halibut #1075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Update halibut #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28ed8de
Update halibut
pawelpabich Mar 10, 2025
3b83f3c
Tentacle changes to accommodate changes in Halibut
pawelpabich May 16, 2025
c80946d
Rollback changes
pawelpabich May 16, 2025
edbe486
Latest halibut
pawelpabich May 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/Octopus.Tentacle.Contracts/Octopus.Tentacle.Contracts.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</Otherwise>
</Choose>
<ItemGroup>
<PackageReference Include="Halibut" Version="8.1.1040" />
<PackageReference Include="Halibut" Version="8.1.1201-pull-633" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Solution Items\SolutionInfo.cs">
Expand Down
5 changes: 5 additions & 0 deletions ...Support/PendingRequestQueueFactories/CancelWhenRequestQueuedPendingRequestQueueFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ public IPendingRequestQueue CreateQueue(Uri endpoint)
return new Decorator(new PendingRequestQueueAsync(halibutTimeoutsAndLimits, new LogFactory().ForEndpoint(endpoint)), cancellationTokenSource, shouldCancel);
}

public Task<IPendingRequestQueue> CreateQueueAsync(Uri endpoint, CancellationToken cancellationToken)
{
return Task.FromResult(CreateQueue(endpoint));
}

class Decorator : IPendingRequestQueue
{
readonly CancellationTokenSource cancellationTokenSource;
Expand Down
7 changes: 7 additions & 0 deletions ...ration/Util/PendingRequestQueueHelpers/CancellationObservingPendingRequestQueueFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Halibut.Diagnostics;
using Halibut.ServiceModel;
using Octopus.Tentacle.Tests.Integration.Support;
Expand All @@ -11,5 +13,10 @@ public IPendingRequestQueue CreateQueue(Uri endpoint)
{
return new CancellationTokenObservingPendingRequestQueueDecorator(new PendingRequestQueueAsync(new HalibutTimeoutsAndLimitsForTestBuilder().Build(), new LogFactory().ForEndpoint(endpoint)));
}

public Task<IPendingRequestQueue> CreateQueueAsync(Uri endpoint, CancellationToken cancellationToken)
{
return Task.FromResult(CreateQueue(endpoint));
}
}
}