[UPDATE] remove defer function to close channel, it will cause the su…

…bscription failed in the future.
gradyzhuo · Sep 8, 2024 · c861288 · c861288
1 parent 89197c7
commit c861288
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 33 deletions.
diff --git a/Sources/EventStoreDB/EventStoreDBClient.swift b/Sources/EventStoreDB/EventStoreDBClient.swift
@@ -118,10 +118,6 @@ extension EventStoreDBClient {
     /// - Returns: AsyncStream to Read.Response
     public func readStream(to streamIdentifier: Stream.Identifier, cursor: Cursor<StreamClient.Read.CursorPointer>, configure: (_ options: StreamClient.Read.Options) -> StreamClient.Read.Options = { $0 }) throws -> StreamClient.Read.Responses {
         let channel = try GRPCChannelPool.with(settings: settings, group: group)
-//        defer{
-//            let promise = group.any().makePromise(of: Void.self)
-//            channel.closeGracefully(deadline: .distantFuture, promise: promise)
-//        }
         let client = StreamClient(channel: channel, callOptions: defaultCallOptions)
         let options = configure(.init())
 
@@ -179,10 +175,6 @@ extension EventStoreDBClient {
 extension EventStoreDBClient {
     public func startScavenge(threadCount: Int32, startFromChunk: Int32) async throws -> OperationsClient.ScavengeResponse {
         let channel = try GRPCChannelPool.with(settings: settings, group: group)
-        defer{
-            let promise = group.any().makePromise(of: Void.self)
-            channel.closeGracefully(deadline: .now(), promise: promise)
-        }
         let client = OperationsClient(channel: channel, callOptions: defaultCallOptions)
         return try await client.startScavenge(threadCount: threadCount, startFromChunk: startFromChunk)
     }
@@ -191,10 +183,6 @@ extension EventStoreDBClient {
 extension EventStoreDBClient {
     public func createPersistentSubscription(to identifier: Stream.Identifier, groupName: String, options: PersistentSubscriptionsClient.Create.ToStream.Options = .init()) async throws {
         let channel = try GRPCChannelPool.with(settings: settings, group: group)
-        defer{
-            let promise = group.any().makePromise(of: Void.self)
-            channel.closeGracefully(deadline: .now(), promise: promise)
-        }
         let underlyingClient = PersistentSubscriptionsClient.UnderlyingClient(channel: channel, defaultCallOptions: defaultCallOptions)
         let handler: PersistentSubscriptionsClient.Create.ToStream = .init(streamIdentifier: identifier, groupName: groupName, options: options)
 
@@ -205,10 +193,6 @@ extension EventStoreDBClient {
 
     public func createPersistentSubscriptionToAll(groupName: String, configure: (_ options: PersistentSubscriptionsClient.Create.ToAll.Options) -> PersistentSubscriptionsClient.Create.ToAll.Options = { $0 }) async throws {
         let channel = try GRPCChannelPool.with(settings: settings, group: group)
-        defer{
-            let promise = group.any().makePromise(of: Void.self)
-            channel.closeGracefully(deadline: .now(), promise: promise)
-        }
         let underlyingClient = PersistentSubscriptionsClient.UnderlyingClient(channel: channel, defaultCallOptions: defaultCallOptions)
         let options = configure(.init())
         let handler: PersistentSubscriptionsClient.Create.ToAll = .init(groupName: groupName, options: options)
@@ -221,10 +205,6 @@ extension EventStoreDBClient {
 
     public func restartPersistentSubscriptionSubsystem() async throws {
         let channel = try GRPCChannelPool.with(settings: settings, group: group)
-        defer{
-            let promise = group.any().makePromise(of: Void.self)
-            channel.closeGracefully(deadline: .now(), promise: promise)
-        }
         let client = PersistentSubscriptionsClient(channel: channel, callOptions: defaultCallOptions)
         return try await client.restartSubsystem()
     }
@@ -233,10 +213,6 @@ extension EventStoreDBClient {
 
     public func subscribePersistentSubscription(to streamSelection: Selector<Stream.Identifier>, groupName: String, configure: (_ options: PersistentSubscriptionsClient.Read.Options) -> PersistentSubscriptionsClient.Read.Options = { $0 }) async throws -> PersistentSubscriptionsClient.Subscription {
         let channel = try GRPCChannelPool.with(settings: settings, group: group)
-        defer{
-            let promise = group.any().makePromise(of: Void.self)
-            channel.closeGracefully(deadline: .now(), promise: promise)
-        }
         let client = PersistentSubscriptionsClient(channel: channel, callOptions: defaultCallOptions)
 
         let options = configure(.init())

diff --git a/Tests/EventStoreDBTests/EventStoreDBPresistentSubscriptionTests.swift b/Tests/EventStoreDBTests/EventStoreDBPresistentSubscriptionTests.swift
@@ -22,10 +22,6 @@ final class EventStoreDBPersistentSubscriptionTests: XCTestCase {
     override func setUp() async throws {
         let group = MultiThreadedEventLoopGroup(numberOfThreads: 1)
         let channel = try GRPCChannelPool.with(settings: settings, group: group)
-        defer{
-            let promise = group.any().makePromise(of: Void.self)
-            channel.closeGracefully(deadline: .now(), promise: promise)
-        }
         let subscriptionClient = try PersistentSubscriptionsClient(channel: channel, callOptions: settings.makeCallOptions())
         do {
             try await subscriptionClient.deleteOn(stream: streamSelector, groupName: groupName)
@@ -37,10 +33,6 @@ final class EventStoreDBPersistentSubscriptionTests: XCTestCase {
     func testCreate() async throws {
         let group = MultiThreadedEventLoopGroup(numberOfThreads: 1)
         let channel = try GRPCChannelPool.with(settings: settings, group: group)
-        defer{
-            let promise = group.any().makePromise(of: Void.self)
-            channel.closeGracefully(deadline: .now(), promise: promise)
-        }
         let subscriptionClient = try PersistentSubscriptionsClient(channel: channel, callOptions: settings.makeCallOptions())
 
         let client = EventStoreDBClient(settings: settings)
@@ -52,6 +44,7 @@ final class EventStoreDBPersistentSubscriptionTests: XCTestCase {
 
     func testSubscribe() async throws {
         try await testCreate()
+
 
         let settings = ClientSettings.localhost()
         let client = EventStoreDBClient(settings: settings)
@@ -66,7 +59,7 @@ final class EventStoreDBPersistentSubscriptionTests: XCTestCase {
                                                      )) { options in
             options.revision(expected: .any)
         }
-
+        
         var lastEventResult: PersistentSubscriptionsClient.Subscription.EventResult? = nil
         for try await result in subscription {
             lastEventResult = result