Skip to content
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

Fix regressions in 5.7.x #4513

Merged
merged 4 commits into from
Mar 27, 2019
Merged

Conversation

minrk
Copy link
Member

@minrk minrk commented Mar 26, 2019

Fixes some closed-socket issues with direct-checks for closed or closing sockets, which seems to change across tornado versions.

for backport to 5.7.x

debugging issues in jupyterlab/jupyterlab#6138

@minrk
Copy link
Member Author

minrk commented Mar 26, 2019

In testing jupyterlab/jupyterlab#6138, I also discovered a regression caused by #4412, where the async restart_kernel was not properly awaited. Instead, the Future was returned from the coroutine instead of the result of the future.

@minrk minrk added this to the 5.7.7 milestone Mar 26, 2019
@minrk minrk changed the title [wip] catch errors when writing on closed sockets Fix regressions in 5.7.x Mar 26, 2019
minrk added 4 commits March 27, 2019 14:42
avoids issues with direct-checks for closed or closing sockets,
which seems to change across tornado versions

fixes some tornado 6 issues
gen.Return shouldn't be passed the Future, the future should be awaited
@minrk minrk force-pushed the websocket-closed-forward branch from d9afcb4 to 850eda5 Compare March 27, 2019 13:43
@minrk
Copy link
Member Author

minrk commented Mar 27, 2019

Tests passed prior to rebase which fixed only the selenium and docs tests. Merging this so we can get 5.7.7 out.

@minrk minrk merged commit 35ac42b into jupyter:master Mar 27, 2019
@minrk minrk deleted the websocket-closed-forward branch March 27, 2019 15:11
meeseeksmachine pushed a commit to meeseeksmachine/notebook that referenced this pull request Mar 27, 2019
minrk added a commit that referenced this pull request Mar 27, 2019
…3-on-5.7.x

Backport PR #4513 on branch 5.7.x (Fix regressions in 5.7.x)
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 28, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant