rack-haproxy_status 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e4ea88680fb72ffea304f2aaf416b2ea3f5b79b
-  data.tar.gz: 2bd7d76caa8153252183ec8e0b5f9eca2430e27a
+  metadata.gz: b99c7892b98ab925a0840e7742eece6a125e2330
+  data.tar.gz: 9b399ab748ccd22c484ff4d062561025f037194f
 SHA512:
-  metadata.gz: 7a830dbf7757e794ce0c41abfec299c87a09b04c9975076d32ff915e77c922fe5e53b81e3fd13dabb73ec0fe77f6fe4f3d6c4f29076bf21720dbdb4f140165e7
-  data.tar.gz: d77d03a0da01ed5ec952b3c490caba04b40c9893a1d2fbe47f3a39b2452553daae99103c46e5974e4e4dd04e779690770586c62f082fbcf3049304685d38186b
+  metadata.gz: 2bda358c25493572ecd740ea2856456765188ea81b6b0b73d70824de2cd7961f015b288392074e2f4b5b3eeb6e2be7a465443ed4c5d95c00b10ed67983be1c6d
+  data.tar.gz: b7e16a5ab89ddeea4baed733e0e419aa79caaf7bba7716859b3a5a4e4b90b36ea460d19e0bb445d43e179c1481e359e3e7f8a72fc809209af9125ebb67a5866a

data/lib/rack/haproxy_status.rb

@@ -1,4 +1,5 @@
 require "rack/haproxy_status/version"
+require "json"
 
 module Rack
   module HaproxyStatus
@@ -7,17 +8,23 @@ module Rack
 
       VALID_STATES = %w(on off)
 
-      def initialize(path:, io: ::File)
+      def initialize(path:, io: ::File, extra_checks: [])
         @path = path
         @io = io
+        @extra_checks = extra_checks
       end
 
       def call(env)
-        if balancer_member?
-          [200, {'Content-Type' => 'application/json'}, ['{"status": "ok", "member": true}']]
-        else
-          [503, {'Content-Type' => 'application/json'}, ['{"status": "ok", "member": false}']]
-        end
+        balancer_member = balancer_member?
+        extra_checks_all_successful = extra_checks_all_successful?
+        http_code = balancer_member && extra_checks_all_successful ? 200 : 503
+        status = extra_checks_all_successful ? 'ok' : 'error'
+
+        [
+          http_code,
+          {'Content-Type' => 'application/json'},
+          [JSON.generate(status: status, member: balancer_member?)]
+        ]
       rescue InvalidStatus
         [500, {'Content-Type' => 'application/json'}, ['{"status": "unknown status"}']]
       end
@@ -29,6 +36,10 @@ module Rack
         raise InvalidStatus, "Invalid state: #{state}" unless VALID_STATES.include?(state)
         state == "on"
       end
+
+      def extra_checks_all_successful?
+        @extra_checks.map { |check| check.call() }.all?
+      end
     end
   end
 end

data/lib/rack/haproxy_status/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module HaproxyStatus
-    VERSION = "0.8.1"
+    VERSION = "0.9.0"
   end
 end

data/spec/rack-haproxy_status_spec.rb

@@ -3,7 +3,8 @@ require 'json'
 
 describe Rack::HaproxyStatus::Endpoint do
   let(:disk)             { double("File", read: "on") }
-  let(:response)         { described_class.new(path: 'config/status', io: disk).call({}) }
+  let(:extra_checks)     { [] }
+  let(:response)         { described_class.new(path: 'config/status', io: disk, extra_checks: extra_checks).call({}) }
   let(:response_status)  { response[0] }
   let(:response_headers) { response[1] }
   let(:response_body)    { response[2] }
@@ -31,4 +32,31 @@ describe Rack::HaproxyStatus::Endpoint do
       expect(response_status).to eq(500)
     end
   end
+
+  describe 'extra_checks that succeed' do
+    let(:extra_checks) { [Proc.new { true }] }
+
+    it 'should be in the balancer' do
+      expect(response_status).to eq(200)
+      expect(result.fetch('status')).to eq('ok')
+    end
+  end
+
+  describe 'extra_checks that fail' do
+    let(:extra_checks) { [Proc.new { 3 == 2 }] }
+
+    it 'should not be in the balancer' do
+      expect(response_status).to eq(503)
+      expect(result.fetch('status')).to eq('error')
+    end
+  end
+
+  describe 'extra_checks that partially fail' do
+    let(:extra_checks) { [Proc.new { 3 == 3 }, Proc.new { 3 == 2 }] }
+
+    it 'should not be in the balancer' do
+      expect(response_status).to eq(503)
+      expect(result.fetch('status')).to eq('error')
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-haproxy_status
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,10 +89,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Tiny mountable app that returns an HTTP state based on contents of a file.
 test_files:
 - spec/rack-haproxy_status_spec.rb
-has_rdoc: