Skip to content

Enable TCP keepalive for CRuby #1353

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
Jun 12, 2017
Merged

Enable TCP keepalive for CRuby #1353

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db44641
requires ruby-oci8 2.2.4 or higher
yahonda Jun 1, 2017
9a15516
Friendly message
yahonda Jun 1, 2017
2a69815
Enable TCP keepalive value supported by ruby-oci8 2.2.4
yahonda Jun 12, 2017
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
10 changes: 8 additions & 2 deletions lib/active_record/connection_adapters/oracle_enhanced/oci_connection.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,14 @@
end

# check ruby-oci8 version
required_oci8_version = [2, 2, 0]
required_oci8_version = [2, 2, 4]
oci8_version_ints = OCI8::VERSION.scan(/\d+/).map { |s| s.to_i }
if (oci8_version_ints <=> required_oci8_version) < 0
raise LoadError, "ERROR: ruby-oci8 version #{OCI8::VERSION} is too old. Please install ruby-oci8 version #{required_oci8_version.join('.')} or later."
$stderr.puts <<-EOS.strip_heredoc
"ERROR: ruby-oci8 version #{OCI8::VERSION} is too old. Please install ruby-oci8 version #{required_oci8_version.join('.')} or later."
EOS

exit!
end

module ActiveRecord
Expand Down Expand Up @@ -325,6 +329,8 @@ def self.new_connection(config)
else
database
end
OCI8.properties[:tcp_keepalive] = true
OCI8.properties[:tcp_keepalive_time] = 600
conn = OCI8.new username, password, connection_string, privilege
conn.autocommit = true
conn.non_blocking = true if async
Expand Down