Skip to content

fix concurrency api usage #282

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

Merged
merged 2 commits into from
Jan 11, 2023
Merged

fix concurrency api usage #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0892e47
fix concurrency api isage
tomerd Jan 10, 2023
0720fc4
fixup
tomerd Jan 10, 2023
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
3 changes: 3 additions & 0 deletions Sources/AWSLambdaRuntimeCore/LambdaRunner.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,6 @@ extension Result {
}
}
}

/// This is safe since lambda runtime synchronizes by dispatching all methods to a single `EventLoop`
extension LambdaRunner: @unchecked Sendable {}
10 changes: 5 additions & 5 deletions Tests/AWSLambdaRuntimeCoreTests/LambdaTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ class LambdaTest: XCTestCase {
let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1)
defer { XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) }

let server = try MockLambdaServer(behavior: Behavior()).start().wait()
let server = try await MockLambdaServer(behavior: Behavior()).start().get()
defer { XCTAssertNoThrow(try server.stop().wait()) }

let logger = Logger(label: "TestLogger")
Expand All @@ -278,17 +278,17 @@ class LambdaTest: XCTestCase {
logger.info("hello")
let runner = LambdaRunner(eventLoop: eventLoopGroup.next(), configuration: configuration)

try runner.run(
try await runner.run(
handler: CodableEventLoopLambdaHandler(
handler: handler1,
allocator: ByteBufferAllocator()
),
logger: logger
).wait()
).get()

try runner.initialize(handlerType: CodableEventLoopLambdaHandler<Handler>.self, logger: logger, terminator: LambdaTerminator()).flatMap { handler2 in
try await runner.initialize(handlerType: CodableEventLoopLambdaHandler<Handler>.self, logger: logger, terminator: LambdaTerminator()).flatMap { handler2 in
runner.run(handler: handler2, logger: logger)
}.wait()
}.get()
}

try await task.value
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# this file is not designed to be run directly
# instead, use the docker-compose.<os>.<swift> files
# eg docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.al2.55.yaml run test
# eg docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.al2.57.yaml run test
version: "3"

services:
Expand Down