rack-ecg 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15da50402ccd3b3dcc2efab39fcdfde5a320931f
-  data.tar.gz: b0ee8b09dd75d9f25796c70a31e7477c320c38e7
+  metadata.gz: 6f59a0b33808baa8d2e2e9fce089e2cfdf03668c
+  data.tar.gz: 3cc238f62ea9afc55dccea25814b24aecc9975aa
 SHA512:
-  metadata.gz: 8da335a59221c75231ca7bc618748c59a2926a4a3a15326ff0246a10b19b1bcd7e2f118218f78f80adcacb65d2b4b8420f4843373805470f1fdcc77635b9a4bd
-  data.tar.gz: ba2660ec5a305e5758cee866aa0c8e466256209b82d8ad8999742b00deb739a5b8fde4cfa9a8a3153f329c2a91142273a1785e8642a84f2d58db9604ae1d4b98
+  metadata.gz: f122cef317b2d199fe20075495826a9581af55042addceb61e7ce3f9a32ffb92f3a566590e4b2afa33ee78ca00da9b624265ae9fa1d06363066edb452da64944
+  data.tar.gz: 2cf179f722e4024aaf52c3a5c10d676e083a88c4a1b5b5fdc3b6cd63ed5ec9b7c5cf85f384bc35504a95aed0e085e73335638514c1d9b2aae3848728c36622d4

data/examples/basic.ru

@@ -1,6 +1,5 @@
 require 'rack/ecg'
 
 use Rack::ECG
-use Rack::Reloader
 
 run -> (env) { [200, {}, ["Hello, World"]] }

data/examples/checks.ru

@@ -1,6 +1,5 @@
 require 'rack/ecg'
 
 use Rack::ECG, checks: [:git_revision, :migration_version]
-use Rack::Reloader
 
 run -> (env) { [200, {}, ["Hello, World"]] }

data/examples/mounted_path.ru

@@ -1,6 +1,5 @@
 require 'rack/ecg'
 
 use Rack::ECG, at: "/health_check"
-use Rack::Reloader
 
 run -> (env) { [200, {}, ["Hello, World"]] }

data/examples/stand_alone.ru

@@ -0,0 +1,3 @@
+require 'rack/ecg'
+
+run Rack::ECG.new

data/lib/rack/ecg.rb

@@ -1,24 +1,29 @@
 require "rack/ecg/version"
 require "json"
 require "open3"
+require "rack/ecg/check"
 
 module Rack
   class ECG
     DEFAULT_MOUNT_AT = "/_ecg"
-    DEFAULT_CHECKS = [ :check_http ]
+    DEFAULT_CHECKS = [ :http ]
 
-    def initialize(app, options={})
+    def initialize(app=nil, options={})
       @app = app
-      option_checks = options.delete(:checks) || []
-      option_checks = option_checks.map{|check| "check_#{check}".to_sym }
-      @checks = DEFAULT_CHECKS + option_checks
+
+      check_names = options.delete(:checks) || []
+      @check_classes = build_check_classes(check_names)
+
       @at = options.delete(:at) || DEFAULT_MOUNT_AT
     end
 
     def call(env)
       if env["PATH_INFO"] == @at
 
-        check_results = @checks.inject({}){|results, check_method| results.merge(send(check_method)) }
+        check_results = @check_classes.inject({}){|results, check_class|
+          check = check_class.new
+          results.merge(check.result.to_json)
+        }
 
         response_status = check_results.any?{|check| check[1][:status] == "error" } ? 500 : 200
 
@@ -30,51 +35,22 @@ module Rack
         response_body = JSON.pretty_generate(check_results)
 
         [response_status, response_headers, [response_body]]
-      else
+      elsif @app
         @app.call(env)
+      else
+        [404, {},[]]
       end
     end
 
     private
-    def check_http
-      # if rack-ecg is serving a request - http is obviously working so far...
-      # this is basically a "hello-world"
-      {http: {status: "ok", value: "online" } }
-    end
-
-    def check_error
-      # this always fails. mainly for testing
-      {error: {status: "error", value: "PC LOAD LETTER" } }
-    end
-
-    def check_git_revision
-      _stdin, stdout, stderr, wait_thread = Open3.popen3("git rev-parse HEAD")
-
-      success = wait_thread.value.success?
-      status = success ? "ok" : "error"
-      value = success ? stdout.read : stderr.read
-      value = value.strip
-      {git_revision: {status: status, value: value} }
-    end
-
-    def check_migration_version
-      value = ""
-      status = "ok"
-      begin
-        if defined?(ActiveRecord)
-          connection = ActiveRecord::Base.connection
-          result_set = connection.execute("select max(version) as version from schema_migrations")
-          version = result_set.first
-          value = version["version"]
-        else
-          status = "error"
-          value = "ActiveRecord not found"
-        end
-      rescue => e
-        status = "error"
-        value = e.message
-      end
-      {migration_version: {status: status, value: value} }
+    def build_check_classes(check_names)
+      check_names = Array(check_names) # handle nil, or not a list
+      check_names = check_names | DEFAULT_CHECKS # add the :http check if it's not there
+      check_names.map{|check_name|
+        check_class = CheckRegistry.instance[check_name]
+        raise "Don't know about check #{check_name}" unless check_class
+        check_class
+      }
     end
   end
 end

data/lib/rack/ecg/check.rb

@@ -0,0 +1,17 @@
+require "rack/ecg/check_registry"
+require "rack/ecg/check/error"
+require "rack/ecg/check/git_revision"
+require "rack/ecg/check/http"
+require "rack/ecg/check/migration_version"
+
+module Rack
+  class ECG
+    module Check
+      class Result < Struct.new(:name, :status, :value)
+        def to_json
+          {name => {:status => status, :value => value}}
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Rack
+  class ECG
+    module Check
+      # if rack-ecg is serving a request - http is obviously working so far...
+      # this is basically a "hello-world"
+      class Error
+        def result
+          Result.new(:error, "error", "PC LOAD LETTER")
+        end
+      end
+
+      CheckRegistry.instance.register(:error, Error)
+
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module Rack
+  class ECG
+    module Check
+      class GitRevision
+        def result
+          _stdin, stdout, stderr, wait_thread = Open3.popen3("git rev-parse HEAD")
+
+          success = wait_thread.value.success?
+
+          status = success ? "ok" : "error"
+
+          value = success ? stdout.read : stderr.read
+          value = value.strip
+
+          Result.new(:git_revision, status, value)
+        end
+      end
+
+      CheckRegistry.instance.register(:git_revision, GitRevision)
+
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Rack
+  class ECG
+    module Check
+      # if rack-ecg is serving a request - http is obviously working so far...
+      # this is basically a "hello-world"
+      class Http
+        def result
+          Result.new(:http, "ok", "online")
+        end
+      end
+
+      CheckRegistry.instance.register(:http, Http)
+
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+module Rack
+  class ECG
+    module Check
+      class MigrationVersion
+        def result
+          value = ""
+          status = "ok"
+          begin
+            if defined?(ActiveRecord)
+              connection = ActiveRecord::Base.connection
+              result_set = connection.execute("select max(version) as version from schema_migrations")
+              version = result_set.first
+              value = version["version"]
+            else
+              status = "error"
+              value = "ActiveRecord not found"
+            end
+          rescue => e
+            status = "error"
+            value = e.message
+          end
+
+          Result.new(:migration_version, status, value)
+        end
+      end
+
+      CheckRegistry.instance.register(:migration_version, MigrationVersion)
+
+    end
+  end
+end

data/lib/rack/ecg/check_registry.rb

@@ -0,0 +1,21 @@
+require "singleton"
+
+module Rack
+  class ECG
+    class CheckRegistry
+      include Singleton
+
+      def initialize()
+        @registry = {}
+      end
+
+      def register(name, check_class)
+        @registry[name] = check_class
+      end
+
+      def [](name)
+        @registry[name]
+      end
+    end
+  end
+end

data/lib/rack/ecg/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class ECG
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-ecg
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Envato
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -115,8 +115,15 @@ files:
 - examples/basic.ru
 - examples/checks.ru
 - examples/mounted_path.ru
+- examples/stand_alone.ru
 - lib/rack-ecg.rb
 - lib/rack/ecg.rb
+- lib/rack/ecg/check.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_registry.rb
 - lib/rack/ecg/version.rb
 - rack-ecg.gemspec
 - spec/rack_middleware_spec.rb