rack-ecg 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e69b8b06f6e9447931c2dd5f6a709153fc05054
-  data.tar.gz: 7fd824b68af2e6db167af65b7518004c1c7aabce
+  metadata.gz: b3d3e3118a76ef6c60141ec590ea0feb00781a65
+  data.tar.gz: eb8a0b817ab97ce981828fa8c465b60806fcf978
 SHA512:
-  metadata.gz: 80b858e5dbf7874a6db6d70361c7f8c5726b515113e3bece707c9c857ed70d0d14448ee640899433f7bc4206458cb418b23b03b66d72e32b18c2b5a347c2bcc8
-  data.tar.gz: 6fa5476c8cba27af405f0c648be87843d79c89f166328ca0b8b15368f3d8cb1b8c3fda15ddc0c850e8d5b66711635c1ca02193001e5cd514fe43074599f8582d
+  metadata.gz: 76a8c2d9eaf627ee8c4277fe564a0712ae05347237652fb26b8950ecfe51e5aeecbb084a72516d45a9e347ef66bc6e8db657e12eb9444376581fafdfbbb1c8a0
+  data.tar.gz: 40baa754d837d5ddf996a43604d6e2ed5693a74bf488f01f1b45f7234e60bd53f2e79b073583d66f3f9031d7d1edf729dbffc6126489affc6fd5c1fee7ad03df

data/README.md

@@ -91,11 +91,13 @@ HTTP responses can be returned. There are a number of built in checks that
 - `:migration_version` - this assumes you are using ActiveRecord migrations. It
   queries the `schema_versions` table and tells you what version the database is
 at.
+- `:active_record` - this checks if an ActiveRecord connection is active.
+- `:redis` - this checks if a Redis connection is active.
 
-So using `git_revision` and `migration_version` would look like:
+So using `git_revision`, `migration_version`, `active_record`, and `redis` would look like:
 
 ```ruby
-use Rack::ECG, checks: [:git_revision, :migration_version]
+use Rack::ECG, checks: [:git_revision, :migration_version, :active_record, :redis]
 ```
 
 ```
@@ -112,6 +114,14 @@ $ curl http://localhost:9292/_ecg
   "migration_version": {
     "status": "ok",
     "value": "20150319050250"
+  },
+  "active_record": {
+    "status": "ok",
+    "value": "true"
+  },
+  "redis": {
+    "status": "ok",
+    "value": "true"
   }
 }
 ```

data/lib/rack/ecg/check.rb

@@ -3,6 +3,8 @@ require "rack/ecg/check/error"
 require "rack/ecg/check/git_revision"
 require "rack/ecg/check/http"
 require "rack/ecg/check/migration_version"
+require "rack/ecg/check/active_record_connection"
+require "rack/ecg/check/redis_connection"
 
 module Rack
   class ECG

data/lib/rack/ecg/check/active_record_connection.rb

@@ -0,0 +1,28 @@
+module Rack
+  class ECG
+    module Check
+      class ActiveRecordConnection
+        def result
+          value = ""
+          status = "ok"
+          begin
+            if defined?(ActiveRecord)
+              value = ::ActiveRecord::Base.connection.active?
+              status = value ? "ok" : "error"
+            else
+              status = "error"
+              value = "ActiveRecord not found"
+            end
+          rescue => e
+            status = "error"
+            value = e.message
+          end
+
+          Result.new(:active_record, status, value.to_s)
+        end
+
+        CheckRegistry.instance.register(:active_record, ActiveRecordConnection)
+      end
+    end
+  end
+end

data/lib/rack/ecg/check/redis_connection.rb

@@ -0,0 +1,28 @@
+module Rack
+  class ECG
+    module Check
+      class RedisConnection
+        def result
+          value = ""
+          status = "ok"
+          begin
+            if defined?(::Redis)
+              value = ::Redis.current.connected?
+              status = value ? "ok" : "error"
+            else
+              status = "error"
+              value = "Redis not found"
+            end
+          rescue => e
+            status = "error"
+            value = e.message
+          end
+
+          Result.new(:redis, status, value.to_s)
+        end
+
+        CheckRegistry.instance.register(:redis, RedisConnection)
+      end
+    end
+  end
+end

data/lib/rack/ecg/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class ECG
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/rack_middleware_spec.rb

@@ -129,7 +129,7 @@ RSpec.describe "when used as middleware" do
       let(:options) {
         { checks: [:migration_version] }
       }
-      context "when availabile" do
+      context "when available" do
         it "is reported" do
           class ActiveRecord
             class Base
@@ -158,5 +158,67 @@ RSpec.describe "when used as middleware" do
         end
       end
     end
+
+    context "active_record" do
+      let(:options) {
+        { checks: [:active_record] }
+      }
+      context "when available" do
+        it "is reported" do
+          class ActiveRecord
+            class Base
+              def self.connection
+              end
+            end
+          end
+          active = true
+          connection = double("connection")
+          expect(ActiveRecord::Base).to receive(:connection).and_return(connection)
+          expect(connection).to receive(:active?).and_return(active)
+          get "/_ecg"
+          expect(json_body["active_record"]["status"]).to eq("ok")
+          expect(json_body["active_record"]["value"]).to eq(active.to_s)
+        end
+      end
+
+      context "when not available" do
+        it "is reported" do
+          Object.send(:remove_const, :ActiveRecord) if defined?(ActiveRecord)
+          get "/_ecg"
+          expect(json_body["active_record"]["status"]).to eq("error")
+          expect(json_body["active_record"]["value"]).to eq("ActiveRecord not found")
+        end
+      end
+    end
+
+    context "redis" do
+      let(:options) {
+        { checks: [:redis] }
+      }
+      context "when available" do
+        it "is reported" do
+          class Redis
+            def self.current
+            end
+          end
+          connected = true
+          instance = double("current")
+          expect(Redis).to receive(:current).and_return(instance)
+          expect(instance).to receive(:connected?).and_return(connected)
+          get "/_ecg"
+          expect(json_body["redis"]["status"]).to eq("ok")
+          expect(json_body["redis"]["value"]).to eq(connected.to_s)
+        end
+      end
+
+      context "when not available" do
+        it "is reported" do
+          Object.send(:remove_const, :Redis) if defined?(Redis)
+          get "/_ecg"
+          expect(json_body["redis"]["status"]).to eq("error")
+          expect(json_body["redis"]["value"]).to eq("Redis not found")
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-ecg
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Envato
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -120,10 +120,12 @@ files:
 - lib/rack-ecg.rb
 - lib/rack/ecg.rb
 - lib/rack/ecg/check.rb
+- lib/rack/ecg/check/active_record_connection.rb
 - lib/rack/ecg/check/error.rb
 - lib/rack/ecg/check/git_revision.rb
 - lib/rack/ecg/check/http.rb
 - lib/rack/ecg/check/migration_version.rb
+- lib/rack/ecg/check/redis_connection.rb
 - lib/rack/ecg/check_registry.rb
 - lib/rack/ecg/version.rb
 - rack-ecg.gemspec
@@ -149,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Rack middleware serving a health check page