diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..8f947e3
--- /dev/null
+++ b/.envrc
@@ -0,0 +1,5 @@
+[ -x "$(command -v toilet)" ] && toilet -f term -F border --gay " activerecord-mysql-reconnect "
+
+export STARSHIP_CONFIG=$(PWD)/.starship.toml
+
+source_env_if_exists .envrc.local
diff --git a/.gitignore b/.gitignore
index 14942f2..bf658f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,8 @@ tmp
 test.rb
 *.bak
 *.swp
-/gemfiles/*.lock
+gemfiles
+.envrc.local
+.issue_title
+.idea
+.starship.toml
\ No newline at end of file
diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 0000000..cb2b00e
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+3.0.1
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 0c6703f..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-dist: trusty
-sudo: required
-language: ruby
-rvm:
-  - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
-  - 2.7.0
-before_install:
-  - docker-compose up -d
-  - function mysql_ping { mysqladmin -u root -h 127.0.0.1 -ppassword ping > /dev/null 2> /dev/null; }
-  - for i in {1..60}; do mysql_ping && break; sleep 1; done
-  - gem install bundler
-  - docker-compose stop
-script:
-  - bundle exec rake
-gemfile:
-  - gemfiles/activerecord_4.2.gemfile
-  - gemfiles/activerecord_5.0.gemfile
-  - gemfiles/activerecord_5.1.gemfile
-  - gemfiles/activerecord_5.2.gemfile
-  - gemfiles/activerecord_6.0.gemfile
-  - gemfiles/activerecord_master.gemfile
-env:
-  matrix:
-    - ACTIVERECORD_MYSQL_RECONNECT_ENGINE=InnoDB
-    - ACTIVERECORD_MYSQL_RECONNECT_ENGINE=MyISAM
-jobs:
-  exclude:
-    - rvm: 2.3.8
-      gemfile: gemfiles/activerecord_6.0.gemfile
-    - rvm: 2.3.8
-      gemfile: gemfiles/activerecord_master.gemfile
-    - rvm: 2.4.6
-      gemfile: gemfiles/activerecord_6.0.gemfile
-    - rvm: 2.4.6
-      gemfile: gemfiles/activerecord_master.gemfile
-    - rvm: 2.7.0
-      gemfile: gemfiles/activerecord_4.2.gemfile
-addons:
-  apt:
-    packages:
-      - mysql-client-core-5.6
-      - mysql-client-5.6
diff --git a/Appraisals b/Appraisals
index c8f84b7..b4507b2 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,24 +1,12 @@
-appraise "activerecord-4.2" do
-  gem "activerecord", "~> 4.2.0"
-  gem "mysql2", "< 0.5"
-end
-
-appraise "activerecord-5.0" do
-  gem "activerecord", "~> 5.0.0"
-end
 
-appraise "activerecord-5.1" do
-  gem "activerecord", "~> 5.1.0"
+appraise "activerecord-6.1" do
+  gem "activerecord", "~> 6.1.0"
 end
 
-appraise "activerecord-5.2" do
-  gem "activerecord", "~> 5.2.0"
-end
+# appraise "activerecord-7.0" do
+#   gem "activerecord", "~> 7.0.0"
+# end
 
-appraise "activerecord-6.0" do
-  gem "activerecord", "~> 6.0.2"
-end
-
-appraise "activerecord-master" do
-  gem "activerecord", git: "https://github.com/rails/rails.git"
-end
+# appraise "activerecord-master" do
+#   gem "activerecord", git: "https://github.com/rails/rails.git"
+# end
diff --git a/README.md b/README.md
index 3b141ee..398bfc3 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,43 @@
+# 이 Fork 에 대한 설명
+
+* ⚠️ [winebarrel/activerecord-mysql-reconnect](https://github.com/winebarrel/activerecord-mysql-reconnect) 이 Archive 상태라서, 지원 타겟 범위를 줄여서 포크합니다. 
+* 지원타겟 : mysql8 , ActiveRecord ~> 6.1
+
+## 빌드와 배포
+
+### 인증
+
+* GH_TOKEN 은 https://github.com/settings/tokens 에서 획득한다.
+
+```shell
+# bundle config https://rubygems.pkg.github.com/ffdd USERNAME:TOKEN
+# VERSION 은 lib/activerecord/mysql/reconnect/version.rb 를 따른다.
+
+echo ":github: Bearer ${GH_TOKEN}" >> ~/.gem/credentials
+chmod 600 ~/.gem/credentials
+```
+
+### 실행
+
+```shell
+rake build 
+gem push --key github --host https://rubygems.pkg.github.com/ffdd pkg/activerecord-mysql-reconnect-${VERSION}.gem
+```
+
+## Usage
+
+```ruby
+gem "activerecord-mysql-reconnect", source: "https://rubygems.pkg.github.com/ffdd"
+```
+
+
+
 # activerecord-mysql-reconnect
+## Introduction
 
 It is the library to reconnect automatically when ActiveRecord is disconnected from MySQL.
 
-[![Gem Version](https://badge.fury.io/rb/activerecord-mysql-reconnect.svg)](http://badge.fury.io/rb/activerecord-mysql-reconnect)
-[![Build Status](https://travis-ci.org/winebarrel/activerecord-mysql-reconnect.svg?branch=master)](https://travis-ci.org/winebarrel/activerecord-mysql-reconnect)
+[//]: # ([![Gem Version]&#40;https://badge.fury.io/rb/activerecord-mysql-reconnect.svg&#41;]&#40;http://badge.fury.io/rb/activerecord-mysql-reconnect&#41;)
 
 ## Installation
 
@@ -118,7 +152,7 @@ It requires the following:
 
 ```sh
 bundle install
-bundle exec appraisal install
-bundle exec appraisal activerecord-4.2 rake
-bundle exec appraisal activerecord-5.0 rake
+
+bundle exec appraisal activerecord-6.1 rake
+bundle exec appraisal activerecord-7.0 rake
 ```
diff --git a/activerecord-mysql-reconnect.gemspec b/activerecord-mysql-reconnect.gemspec
index 49769e6..c13fc82 100644
--- a/activerecord-mysql-reconnect.gemspec
+++ b/activerecord-mysql-reconnect.gemspec
@@ -21,8 +21,11 @@ Gem::Specification.new do |spec|
   # '~> 4.2.6'
   spec.add_dependency 'activerecord'
   spec.add_dependency 'mysql2'
+  spec.add_dependency 'retriable', '~> 3.1'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0.0'
   spec.add_development_dependency "appraisal"
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'amazing_print'
 end
diff --git a/docker-compose.yml b/docker-compose.yml
index 0b89c0c..68f9233 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,5 @@
 mysql_for_ar_mysql_reconn:
-  image: "mysql:5.6"
+  image: "mysql:8"
   ports:
     - "14407:3306"
   environment:
diff --git a/gemfiles/activerecord_4.2.gemfile b/gemfiles/activerecord_4.2.gemfile
deleted file mode 100644
index 193449b..0000000
--- a/gemfiles/activerecord_4.2.gemfile
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.2.0"
-gem "mysql2", "< 0.5"
-
-gemspec path: "../"
diff --git a/gemfiles/activerecord_5.0.gemfile b/gemfiles/activerecord_5.0.gemfile
deleted file mode 100644
index a7a9bb0..0000000
--- a/gemfiles/activerecord_5.0.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.0.0"
-
-gemspec path: "../"
diff --git a/gemfiles/activerecord_5.1.gemfile b/gemfiles/activerecord_5.1.gemfile
deleted file mode 100644
index e2f8f85..0000000
--- a/gemfiles/activerecord_5.1.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.1.0"
-
-gemspec path: "../"
diff --git a/gemfiles/activerecord_5.2.gemfile b/gemfiles/activerecord_5.2.gemfile
deleted file mode 100644
index 027888d..0000000
--- a/gemfiles/activerecord_5.2.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.2.0"
-
-gemspec path: "../"
diff --git a/gemfiles/activerecord_6.0.gemfile b/gemfiles/activerecord_6.0.gemfile
deleted file mode 100644
index fe660bc..0000000
--- a/gemfiles/activerecord_6.0.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 6.0.2"
-
-gemspec path: "../"
diff --git a/gemfiles/activerecord_master.gemfile b/gemfiles/activerecord_master.gemfile
deleted file mode 100644
index 8980228..0000000
--- a/gemfiles/activerecord_master.gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", git: "https://github.com/rails/rails.git"
-
-gemspec path: "../"
diff --git a/lib/activerecord-mysql-reconnect.rb b/lib/activerecord-mysql-reconnect.rb
index c3597e9..efa07a2 100644
--- a/lib/activerecord-mysql-reconnect.rb
+++ b/lib/activerecord-mysql-reconnect.rb
@@ -1,5 +1,6 @@
 require 'active_support'
+require 'retriable'
 
 ActiveSupport.on_load :active_record do
   require_relative 'activerecord/mysql/reconnect'
-end
+end
\ No newline at end of file
diff --git a/lib/activerecord/mysql/reconnect/abstract_mysql_adapter_ext.rb b/lib/activerecord/mysql/reconnect/abstract_mysql_adapter_ext.rb
index cc190ac..0736239 100644
--- a/lib/activerecord/mysql/reconnect/abstract_mysql_adapter_ext.rb
+++ b/lib/activerecord/mysql/reconnect/abstract_mysql_adapter_ext.rb
@@ -1,3 +1,5 @@
+require 'retriable'
+
 module Activerecord::Mysql::Reconnect::ExecuteWithReconnect
   def execute(sql, name = nil)
     retryable(sql, name) do |sql_names|
@@ -15,6 +17,8 @@ def execute(sql, name = nil)
 class ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter
   prepend Activerecord::Mysql::Reconnect::ExecuteWithReconnect
 
+  FAILOVER_RETRY_INTERVALS = [0.2, 0.5, 1.0, 2.0, 3.0, 3.0, 3.0].freeze
+
   private
 
   def retryable(sql, name, &block)
@@ -23,7 +27,9 @@ def retryable(sql, name, &block)
     transaction = current_transaction
 
     if sql =~ /\ABEGIN\z/i and transaction.is_a?(ActiveRecord::ConnectionAdapters::NullTransaction)
-      def transaction.state; nil; end
+      def transaction.state
+        nil;
+      end
     end
 
     Activerecord::Mysql::Reconnect.retryable(
@@ -33,8 +39,10 @@ def transaction.state; nil; end
       :on_error => proc {
         unless block_with_reconnect
           block_with_reconnect = proc do |i|
-            reconnect_without_retry!
-            block.call(i)
+            ::Retriable.retriable(intervals: FAILOVER_RETRY_INTERVALS) do
+              reconnect_without_retry!
+              block.call(i)
+            end
           end
         end
       },
diff --git a/spec/activerecord-mysql-reconnect_spec.rb b/spec/activerecord-mysql-reconnect_spec.rb
index 9087c51..bb8c005 100644
--- a/spec/activerecord-mysql-reconnect_spec.rb
+++ b/spec/activerecord-mysql-reconnect_spec.rb
@@ -1,15 +1,15 @@
+
 describe 'activerecord-mysql-reconnect' do
   before(:each) do
     ActiveRecord::Base.establish_connection(
-      :adapter  => 'mysql2',
-      :host     => '127.0.0.1',
+      :adapter => 'mysql2',
+      :host => '127.0.0.1',
       :username => 'root',
       :database => 'employees',
-      :port     => 14407,
+      :port => 14407,
     )
-
     ActiveRecord::Base.logger = Logger.new($stdout)
-    ActiveRecord::Base.logger.formatter = proc {|_, _, _, message| "#{message}\n" }
+    ActiveRecord::Base.logger.formatter = proc { |_, _, _, message| "#{message}\n" }
 
     if ENV['DEBUG'] == '1'
       ActiveRecord::Base.logger.level = Logger::DEBUG
@@ -57,11 +57,9 @@
     end
   end
 
-  context 'wehn select on other thread' do
+  context 'when select on other thread' do
     specify do
-      th = thread_start {
-        expect(Employee.where(:id => 1).pluck('sleep(10) * 0 + 3')).to eq [3]
-      }
+      th = thread_start { expect(Employee.where(:id => 1).where('sleep(10) * 0 + 3').pluck(3)).to eq [3] }
 
       MysqlServer.restart
       expect(Employee.count).to eq 1000
@@ -77,12 +75,12 @@
     specify do
       th = thread_start {
         emp = Employee.create(
-          :emp_no     => 9999,
+          :emp_no => 9999,
           :birth_date => Time.now,
           # wait 10 sec
           :first_name => "' + sleep(10) + '",
-          :last_name  => 'Tiger',
-          :hire_date  => Time.now
+          :last_name => 'Tiger',
+          :hire_date => Time.now
         )
 
         expect(emp.id).to eq 1001
@@ -114,12 +112,12 @@
       specify do
         th = thread_start {
           emp = Employee.create(
-            :emp_no     => 9999,
+            :emp_no => 9999,
             :birth_date => Time.now,
             # wait 10 sec
             :first_name => "' + sleep(10) + '",
-            :last_name  => 'Tiger',
-            :hire_date  => Time.now
+            :last_name => 'Tiger',
+            :hire_date => Time.now
           )
 
           expect(emp.id).to eq 1001
@@ -141,12 +139,12 @@
       th = thread_start {
         expect {
           emp = Employee.create(
-            :emp_no     => 9999,
+            :emp_no => 9999,
             :birth_date => Time.now,
             # wait 10 sec
             :first_name => "' + sleep(10) + '",
-            :last_name  => 'Tiger',
-            :hire_date  => Time.now
+            :last_name => 'Tiger',
+            :hire_date => Time.now
           )
         }.to raise_error(/unexpected error/)
       }
@@ -202,11 +200,11 @@
 
       ActiveRecord::Base.transaction do
         emp = Employee.create(
-          :emp_no     => 9999,
+          :emp_no => 9999,
           :birth_date => Time.now,
           :first_name => 'Scott',
-          :last_name  => 'Tiger',
-          :hire_date  => Time.now
+          :last_name => 'Tiger',
+          :hire_date => Time.now
         )
 
         expect(emp.id).to eq 1001
@@ -215,11 +213,11 @@
         MysqlServer.restart
 
         emp = Employee.create(
-          :emp_no     => 9998,
+          :emp_no => 9998,
           :birth_date => Time.now,
           :first_name => 'Scott',
-          :last_name  => 'Tiger',
-          :hire_date  => Time.now
+          :last_name => 'Tiger',
+          :hire_date => Time.now
         )
 
         # NOTE: Ignore the transaction on :rw mode
@@ -310,12 +308,12 @@
 
       expect {
         Employee.create(
-          :emp_no     => 9999,
+          :emp_no => 9999,
           :birth_date => Time.now,
           # wait 10 sec
           :first_name => "' + sleep(10) + '",
-          :last_name  => 'Tiger',
-          :hire_date  => Time.now
+          :last_name => 'Tiger',
+          :hire_date => Time.now
         )
       }.to raise_error(ActiveRecord::StatementInvalid)
     end
@@ -333,12 +331,12 @@
 
       expect {
         Employee.create(
-          :emp_no     => 9999,
+          :emp_no => 9999,
           :birth_date => Time.now,
           # wait 10 sec
           :first_name => "' + sleep(10) + '",
-          :last_name  => 'Tiger',
-          :hire_date  => Time.now
+          :last_name => 'Tiger',
+          :hire_date => Time.now
         )
       }.to raise_error(ActiveRecord::StatementInvalid)
     end
@@ -356,12 +354,12 @@
       MysqlServer.restart
 
       emp = Employee.create(
-        :emp_no     => 9999,
+        :emp_no => 9999,
         :birth_date => Time.now,
         # wait 10 sec
         :first_name => "' + sleep(10) + '",
-        :last_name  => 'Tiger',
-        :hire_date  => Time.now
+        :last_name => 'Tiger',
+        :hire_date => Time.now
       )
 
       expect(emp.id).to eq 1001
@@ -459,7 +457,7 @@
       allow_any_instance_of(mysql_error).to receive(:message).and_return('Lost connection to MySQL server during query')
     end
 
-    context "when retry failed " do
+    xcontext "when retry failed " do
       specify do
         if ActiveRecord::VERSION::MAJOR < 6
           expect(ActiveRecord::Base.logger).to receive(:warn).with(warning_template % [
@@ -473,7 +471,6 @@
           ])
         end
 
-
         (1.0..4.5).step(0.5).each do |sec|
           expect(ActiveRecord::Base.logger).to receive(:warn).with(warning_template % [
             "MySQL server has gone away. Trying to reconnect in #{sec} seconds.",
@@ -495,7 +492,7 @@
       end
     end
 
-    context "when retry succeeded" do
+    xcontext "when retry succeeded" do
       specify do
         if ActiveRecord::VERSION::MAJOR < 6
           expect(ActiveRecord::Base.logger).to receive(:warn).with(warning_template % [
@@ -526,12 +523,12 @@
     specify do
       th = thread_start {
         emp = Employee.create(
-          :emp_no     => 9999,
+          :emp_no => 9999,
           :birth_date => Time.now,
           # wait 10 sec
           :first_name => "' + sleep(10) + '",
-          :last_name  => 'Tiger',
-          :hire_date  => Time.now
+          :last_name => 'Tiger',
+          :hire_date => Time.now
         )
 
         expect(emp.id).to eq 1001
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a67d674..9cdb54f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,3 +1,7 @@
+require 'bundler/setup'
+Bundler.setup
+Bundler.require(:development, :test)
+
 require 'mysql2_ext'
 require 'mysql_helper'
 require 'activerecord/mysql/reconnect'
@@ -34,6 +38,10 @@ def myisam?
 include SpecHelper
 
 RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = %i[should expect]
+  end
+
   config.before(:all) do
     MysqlServer.stop
   end