Fix Timeout interrupt handling on Ruby 2.3 #671
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Timeout::ExitException was removed in Ruby 2.3.0, 2.2.3, and 2.1.8 in favor of Timeout::Error, but only 2.1.x and 2.2.x have backward- compatibility aliases.
jeremy
added a commit
to jeremy/rails
that referenced
this pull request
Sep 7, 2015
Known failure on Ruby 2.3/trunk: brianmario/mysql2#671
This was referenced Sep 7, 2015
| # but is present in earlier 2.1.x and 2.2.x, so we provide a shim. | ||
| # | ||
| # Set our own constant instead of modifying core ::Timeout. | ||
| TimeoutError = if defined?(::Timeout::ExitException) |
There was a problem hiding this comment.
Is it better or worse to use a variable instead of a constant?
There was a problem hiding this comment.
Idiomatic to use a constant when it won't be reassigned and we want lexical lookup from an instance method. If this is a value we needed to configure, using a class or instance attribute would make sense.
jeremy
added a commit
to rails/rails
that referenced
this pull request
Sep 8, 2015
Known failure on Ruby 2.3/trunk: brianmario/mysql2#671 Fixes #21544
|
It occurs to me that we need this for Mysql2::Statement#execute as well. To avoid duplicating code, maybe we should move this up to lib/mysql2.rb in the Mysql2 or Mysql2::Util modules? |
sodabrew
added a commit
to sodabrew/mysql2
that referenced
this pull request
Sep 9, 2015
…ent#execute Timeout::ExitException was removed in Ruby 2.3.0, 2.2.3, and 2.1.8, in favor of Timeout::Error. Backwards compatible aliases are provided for Ruby 2.1.x and 2.2.x, but not earlier verions. With thanks to @jeremy for PR brianmario#671 and @yui-knk for PR brianmario#677, this commit also protects prepared statements from being interrupted, so the compat shim is in Mysql2::Util.
|
Let me know if #679 looks solid. |
|
👍 ! |
sodabrew
added a commit
to sodabrew/mysql2
that referenced
this pull request
Sep 10, 2015
…ent#execute Timeout::ExitException was removed in Ruby 2.3.0, 2.2.3, and 2.1.8, in favor of Timeout::Error. Backwards compatible aliases are provided for Ruby 2.1.x and 2.2.x, but not earlier verions. With thanks to @jeremy for PR brianmario#671 and @yui-knk for PR brianmario#677, this commit also protects prepared statements from being interrupted, so the compat shim is in Mysql2::Util.
sodabrew
added a commit
to sodabrew/mysql2
that referenced
this pull request
Sep 10, 2015
…ent#execute Timeout::ExitException was removed in Ruby 2.3.0, 2.2.3, and 2.1.8, in favor of Timeout::Error. Backwards compatible aliases are provided for Ruby 2.1.x and 2.2.x, but not earlier verions. With thanks to @jeremy for PR brianmario#671 and @yui-knk for PR brianmario#677, this commit also protects prepared statements from being interrupted, so the compat shim is in Mysql2::Util.
sodabrew
added a commit
to sodabrew/mysql2
that referenced
this pull request
Sep 10, 2015
…ent#execute Timeout::ExitException was removed in Ruby 2.3.0, 2.2.3, and 2.1.8, in favor of Timeout::Error. Backwards compatible aliases are provided for Ruby 2.1.x and 2.2.x, but not earlier verions. With thanks to @jeremy for PR brianmario#671 and @yui-knk for PR brianmario#677, this commit also protects prepared statements from being interrupted, so the compat shim is in Mysql2::Util.
sodabrew
added a commit
to sodabrew/mysql2
that referenced
this pull request
Sep 10, 2015
…ent#execute Timeout::ExitException was removed in Ruby 2.3.0, 2.2.3, and 2.1.8, in favor of Timeout::Error. Backwards compatible aliases are provided for Ruby 2.1.x and 2.2.x, but not earlier verions. With thanks to @jeremy for PR brianmario#671 and @yui-knk for PR brianmario#677, this commit also protects prepared statements from being interrupted, so the compat shim is in Mysql2::Util.
sodabrew
added a commit
to sodabrew/mysql2
that referenced
this pull request
Sep 13, 2015
…ent#execute Timeout::ExitException was removed in Ruby 2.3.0, 2.2.3, and 2.1.8, in favor of Timeout::Error. Backwards compatible aliases are provided for Ruby 2.1.x and 2.2.x, but not earlier verions. With thanks to @jeremy for PR brianmario#671 and @yui-knk for PR brianmario#677, this commit also protects prepared statements from being interrupted, so the compat shim is in Mysql2::Util.
sodabrew
added a commit
to sodabrew/mysql2
that referenced
this pull request
Sep 14, 2015
…ent#execute Timeout::ExitException was removed in Ruby 2.3.0, 2.2.3, and 2.1.8, in favor of Timeout::Error. Backwards compatible aliases are provided for Ruby 2.1.x and 2.2.x, but not earlier verions. With thanks to @jeremy for PR brianmario#671 and @yui-knk for PR brianmario#677, this commit also protects prepared statements from being interrupted, so the compat shim is in Mysql2::Util.
sodabrew
added a commit
to sodabrew/mysql2
that referenced
this pull request
Sep 14, 2015
…ent#execute Timeout::ExitException was removed in Ruby 2.3.0, 2.2.3, and 2.1.8, in favor of Timeout::Error. Backwards compatible aliases are provided for Ruby 2.1.x and 2.2.x, but not earlier verions. With thanks to @jeremy for PR brianmario#671 and @yui-knk for PR brianmario#677, this commit also protects prepared statements from being interrupted, so the compat shim is in Mysql2::Util.
sodabrew
added a commit
to sodabrew/mysql2
that referenced
this pull request
May 7, 2016
…ent#execute Timeout::ExitException was removed in Ruby 2.3.0, 2.2.3, and 2.1.8, in favor of Timeout::Error. Backwards compatible aliases are provided for Ruby 2.1.x and 2.2.x, but not earlier verions. With thanks to @jeremy for PR brianmario#671 and @yui-knk for PR brianmario#677, this commit also protects prepared statements from being interrupted, so the compat shim is in Mysql2::Util.
sodabrew
added a commit
to sodabrew/mysql2
that referenced
this pull request
May 7, 2016
…ent#execute Timeout::ExitException was removed in Ruby 2.3.0, 2.2.3, and 2.1.8, in favor of Timeout::Error. Backwards compatible aliases are provided for Ruby 2.1.x and 2.2.x, but not earlier verions. With thanks to @jeremy for PR brianmario#671 and @yui-knk for PR brianmario#677, this commit also protects prepared statements from being interrupted, so the compat shim is in Mysql2::Util.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Timeout::ExitException was removed in Ruby 2.3.0, 2.2.3, and 2.1.8
in favor of Timeout::Error, but only 2.1.x and 2.2.x have backward-
compatibility aliases.
Along with #669 and #670, this makes tests green for me on latest Ruby trunk.