Skip to content

Commit e222028

Browse files
committed
Async tweaks
1 parent 775bbd3 commit e222028

File tree

8 files changed

+11
-8
lines changed

8 files changed

+11
-8
lines changed

source/Halibut.Tests/Support/PendingRequestQueueFactories/CancelWhenRequestDequeuedPendingRequestQueueFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public IPendingRequestQueue CreateQueue(Uri endpoint)
2929
return new Decorator(inner.CreateQueue(endpoint), cancellationTokenSource, shouldCancelOnDequeue, onResponseApplied);
3030
}
3131

32-
public Task<IPendingRequestQueue> CreateQueueAsync(Uri endpoint)
32+
public Task<IPendingRequestQueue> CreateQueueAsync(Uri endpoint, CancellationToken cancellationToken)
3333
{
3434
return Task.FromResult(CreateQueue(endpoint));
3535
}

source/Halibut.Tests/Support/PendingRequestQueueFactories/CancelWhenRequestQueuedPendingRequestQueueFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public IPendingRequestQueue CreateQueue(Uri endpoint)
2828
return new Decorator(inner.CreateQueue(endpoint), cancellationTokenSources);
2929
}
3030

31-
public Task<IPendingRequestQueue> CreateQueueAsync(Uri endpoint)
31+
public Task<IPendingRequestQueue> CreateQueueAsync(Uri endpoint, CancellationToken cancellationToken)
3232
{
3333
return Task.FromResult(CreateQueue(endpoint));
3434
}

source/Halibut.Tests/Util/FuncPendingRequestQueueFactory.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Threading;
23
using System.Threading.Tasks;
34
using Halibut.ServiceModel;
45

@@ -18,7 +19,7 @@ public IPendingRequestQueue CreateQueue(Uri endpoint)
1819
return createQueue(endpoint);
1920
}
2021

21-
public Task<IPendingRequestQueue> CreateQueueAsync(Uri endpoint)
22+
public Task<IPendingRequestQueue> CreateQueueAsync(Uri endpoint, CancellationToken cancellationToken)
2223
{
2324
return Task.FromResult(createQueue(endpoint));
2425
}

source/Halibut/DataStream.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace Halibut
1010
{
1111
public class DataStream : IEquatable<DataStream>, IDataStreamInternal
1212
{
13-
readonly Func<Stream, CancellationToken, Task> writerAsync;
13+
protected readonly Func<Stream, CancellationToken, Task> writerAsync;
1414
IDataStreamReceiver? receiver;
1515

1616
[JsonConstructor]

source/Halibut/HalibutRuntime.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ internal HalibutRuntime(
9090

9191
IPendingRequestQueue GetQueue(Uri target)
9292
{
93-
return queues.GetOrAdd(target, u => queueFactory.CreateQueueAsync(target).Result);
93+
return queues.GetOrAdd(target, u => queueFactory.CreateQueue(target));
9494
}
9595

9696
public int Listen()

source/Halibut/HalibutRuntimeBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public HalibutRuntimeBuilder WithRpcObserver(IRpcObserver rpcObserver)
126126
return this;
127127
}
128128

129-
public HalibutRuntimeBuilder WithIdentityObserver(ISubscribersObserver subscribersObserver)
129+
public HalibutRuntimeBuilder WithSubscribersObserver(ISubscribersObserver subscribersObserver)
130130
{
131131
this.identityObserver = subscribersObserver;
132132
return this;
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
using System;
2+
using System.Threading;
23
using System.Threading.Tasks;
34

45
namespace Halibut.ServiceModel
56
{
67
public interface IPendingRequestQueueFactory
78
{
89
IPendingRequestQueue CreateQueue(Uri endpoint);
9-
Task<IPendingRequestQueue> CreateQueueAsync(Uri endpoint);
10+
Task<IPendingRequestQueue> CreateQueueAsync(Uri endpoint, CancellationToken cancellationToken);
1011
}
1112
}

source/Halibut/ServiceModel/PendingRequestQueueFactoryAsync.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Threading;
23
using System.Threading.Tasks;
34
using Halibut.Diagnostics;
45

@@ -20,7 +21,7 @@ public IPendingRequestQueue CreateQueue(Uri endpoint)
2021
return new PendingRequestQueueAsync(halibutTimeoutsAndLimits, logFactory.ForEndpoint(endpoint));
2122
}
2223

23-
public Task<IPendingRequestQueue> CreateQueueAsync(Uri endpoint)
24+
public Task<IPendingRequestQueue> CreateQueueAsync(Uri endpoint, CancellationToken cancellationToken)
2425
{
2526
return Task.FromResult(CreateQueue(endpoint));
2627
}

0 commit comments

Comments
 (0)