/http4s

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.

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

Websocket: Update To Unsafe Signal for Close Rather than Pure Signal #1631

Merged
merged 7 commits into from Jan 17, 2018

Conversation

Reviewers

@SystemFw SystemFw

@rossabaker rossabaker

@bryce-anderson bryce-anderson

@PaulAtBanno PaulAtBanno

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@ChristopherDavenport @SystemFw @rossabaker @bryce-anderson @PaulAtBanno
@ChristopherDavenport
Member

ChristopherDavenport commented Jan 17, 2018

No description provided.

@ChristopherDavenport
Update To Use Atomic Reference for Close Rather than Pure Signal
Verified
This commit was signed with a verified signature.
@ChristopherDavenport ChristopherDavenport Christopher Davenport
GPG key ID: 8340362F6D2756C1 Learn about signing commits
Loading status checks…
88e4f88
@PaulAtBanno

PaulAtBanno approved these changes Jan 17, 2018
View changes

ChristopherDavenport added some commits Jan 17, 2018

@ChristopherDavenport
Clean Up Imports Etc
Verified
This commit was signed with a verified signature.
@ChristopherDavenport ChristopherDavenport Christopher Davenport
GPG key ID: 8340362F6D2756C1 Learn about signing commits
8ff33d5
@ChristopherDavenport
Reapply Scalafmt
Verified
This commit was signed with a verified signature.
@ChristopherDavenport ChristopherDavenport Christopher Davenport
GPG key ID: 8340362F6D2756C1 Learn about signing commits
Loading status checks…
ca6d772
@ChristopherDavenport
Switch to AtomicBoolean
Verified
This commit was signed with a verified signature.
@ChristopherDavenport ChristopherDavenport Christopher Davenport
GPG key ID: 8340362F6D2756C1 Learn about signing commits
Loading status checks…
ae2bc7f
@rossabaker

rossabaker approved these changes Jan 17, 2018
View changes

👍 Seems legit. I assume this has been tested manually.

@bryce-anderson

bryce-anderson approved these changes Jan 17, 2018
View changes

I'm not actually up to date on my streaming combinators so I can't provide feedback on the changes to wsStream but the rest looks good to me.

@ChristopherDavenport
Use Custom unsafeRunSync
Verified
This commit was signed with a verified signature.
@ChristopherDavenport ChristopherDavenport Christopher Davenport
GPG key ID: 8340362F6D2756C1 Learn about signing commits
Loading status checks…
127dd7d
@SystemFw

SystemFw approved these changes Jan 17, 2018
View changes

blaze-core/src/main/scala/org/http4s/blazecore/websocket/Http4sWSStage.scala Outdated
@@ -80,18 +74,20 @@ class Http4sWSStage[F[_]](ws: ws4s.Websocket[F])(implicit F: Effect[F], val ec:
val onStreamFinalize: F[Unit] =
for {
dec <- F.delay(count.decrementAndGet())
_ <- deadSignal.map(signal => if (dec == 0) signal.set(true))
_ <- if (dec == 0) deadSignal.set(true) else ().pure[F]

This comment has been minimized.

Sign in to view
Copy link
@SystemFw

SystemFw Jan 17, 2018

Contributor

().pure[F] --> F.unit?

nicer, but utterly unimportant ofc
blaze-core/src/main/scala/org/http4s/blazecore/websocket/Http4sWSStage.scala
val wsStream = inputstream
.to(ws.receive)
.onFinalize(onStreamFinalize)
.mergeHaltR(ws.send.onFinalize(onStreamFinalize).to(snk).drain)

This comment has been minimized.

Sign in to view
Copy link
@SystemFw

SystemFw Jan 17, 2018 •
edited

Contributor

foo.mergeHaltR(bar.drain) can probably be bar.concurrently(foo) now, but with the new merge on the way this should work as well

This comment has been minimized.

Sign in to view
Copy link
@SystemFw

SystemFw Jan 17, 2018

Contributor

Actually scratch that sorry, you nee the output of foo, but want to complete when bar is done
@SystemFw

This comment has been minimized.

Sign in to view
Contributor

SystemFw commented Jan 17, 2018

Left a few style comments, but nothing too important. I'm also assuming this has been tested
@rossabaker

rossabaker approved these changes Jan 17, 2018
View changes

👍, though I like @SystemFw's suggestions

@ChristopherDavenport
Address Style Review Comments
Verified
This commit was signed with a verified signature.
@ChristopherDavenport ChristopherDavenport Christopher Davenport
GPG key ID: 8340362F6D2756C1 Learn about signing commits
Loading status checks…
e5ef698
@SystemFw

This comment has been minimized.

Sign in to view
Contributor

SystemFw commented Jan 17, 2018

@ChristopherDavenport you were too fast!
@SystemFw

This comment has been minimized.

Sign in to view
Contributor

SystemFw commented Jan 17, 2018

so I was imprecise, concurrently replaces mergeHaltL not mergeHaltR, so if you indeed want to finish the right branch finishes (but still return the output of the right branch), you indeed need what you used to have (sorry 😁)
@ChristopherDavenport

This comment has been minimized.

Sign in to view
Member

ChristopherDavenport commented Jan 17, 2018

:(
@ChristopherDavenport
Switch back to mergeHaltR
Verified
This commit was signed with a verified signature.
@ChristopherDavenport ChristopherDavenport Christopher Davenport
GPG key ID: 8340362F6D2756C1 Learn about signing commits
Loading status checks…
950516f

@ChristopherDavenport ChristopherDavenport changed the title from Websocket: Update To Use Atomic Reference for Close Rather than Pure Signal to Websocket: Update To Unsafe Signal for Close Rather than Pure Signal Jan 17, 2018

@ChristopherDavenport ChristopherDavenport merged commit 18d659e into http4s:master Jan 17, 2018
1 of 2 checks passed

1 of 2 checks passed

continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@ChristopherDavenport ChristopherDavenport deleted the ChristopherDavenport:updateWSStage branch Jan 17, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment