From 2492d710e14a4c22491caf8ef61daaad364e9009 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 4 Sep 2013 16:22:32 +0200
Subject: [PATCH] Use new follower API added to Travis::Model

---
 Gemfile                                   |  2 --
 Gemfile.lock                              |  9 ---------
 lib/travis/api/app.rb                     | 22 ++--------------------
 lib/travis/api/app/helpers/db_follower.rb |  4 ++--
 4 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3bd4a90d..c4d597df 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,8 +22,6 @@ gem 'memcachier'
 gem 'pry'
 gem 'metriks',         '0.9.9.5'
 
-gem 'ar-octopus',      github: 'travis-ci/octopus', require: nil
-
 group :test do
   gem 'rspec',         '~> 2.13'
   gem 'factory_girl',  '~> 2.4.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index bdc43cc9..138484c7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -21,14 +21,6 @@ GIT
     yard-sinatra (1.0.0)
       yard (~> 0.7)
 
-GIT
-  remote: git://github.com/travis-ci/octopus.git
-  revision: 6e68a6c112df4de4a8495a1058be3d7cdd7f9f3d
-  specs:
-    ar-octopus (0.6.0)
-      activerecord (>= 3.0.0, < 4.0)
-      activesupport (>= 3.0.0, < 4.0)
-
 GIT
   remote: git://github.com/travis-ci/travis-core.git
   revision: f3c2b689fd8ff1986501259f270eba2bc705a9ad
@@ -282,7 +274,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ar-octopus!
   bunny (~> 0.8.0)
   dalli
   database_cleaner (~> 0.8.0)
diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb
index 0815f606..354fc753 100644
--- a/lib/travis/api/app.rb
+++ b/lib/travis/api/app.rb
@@ -159,26 +159,8 @@ module Travis::Api
 
       def self.setup_database_connections
         Travis::Database.connect
-
-        return unless Travis.config.use_database_follower?
-        require 'octopus'
-
-        if Travis.env == 'production' || Travis.env == 'staging'
-          puts "Setting up the DB follower as a read slave"
-
-          # Octopus checks for Rails.env, just hardcode enabled?
-          Octopus.instance_eval do
-            def enabled?
-              true
-            end
-          end
-
-          ActiveRecord::Base.custom_octopus_connection = false
-
-          ::Octopus.setup do |config|
-            config.shards = { :follower => Travis.config.database_follower }
-            config.environments = ['production', 'staging']
-          end
+        if Travis.config.database_follower
+          Travis::Model.establish_follower_connection(Travis.config.database_follower)
         end
       end
 
diff --git a/lib/travis/api/app/helpers/db_follower.rb b/lib/travis/api/app/helpers/db_follower.rb
index 1bd654e4..948f70c5 100644
--- a/lib/travis/api/app/helpers/db_follower.rb
+++ b/lib/travis/api/app/helpers/db_follower.rb
@@ -4,8 +4,8 @@ class Travis::Api::App
   module Helpers
     module DbFollower
       def prefer_follower
-        if Travis.config.use_database_follower?
-          Octopus.using(:follower) do
+        if Travis::Features.feature_active?(:api_use_db_follower)
+          Travis::Model.using_follower do
             yield
           end
         else