Skip to content

cancel should be done with outbound user event #110

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 3 commits into from
Sep 23, 2019
Merged

cancel should be done with outbound user event #110

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8721a1
cancel should be done with outbound user event
artemredkin Sep 23, 2019
dea1998
review fix: fire event out of the lock
artemredkin Sep 23, 2019
77e1ea1
test fix: handle outbound events
artemredkin Sep 23, 2019
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 Sources/AsyncHTTPClient/HTTPHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ extension HTTPClient {
self.lock.withLock {
if !cancelled {
cancelled = true
channel?.pipeline.fireUserInboundEventTriggered(TaskCancelEvent())
channel?.triggerUserOutboundEvent(TaskCancelEvent(), promise: nil)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think since cancellation is not guaranteed to do anything (it's best effort only), we can skip any errors, wdyt?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@artemredkin firing through the ChannelPipeline should come out of the lock. So something like

let channel = self.lock.withLock {
    if !self.cancelled {
        self.cancelled = true
        return self.channel
    }
 }
channel?.triggerUserOutboundEvent(...)

Regarding ignoring the promise: I'm okay with that.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed, thanks!

}
}
}
Expand Down