wrenchmode-rack 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58f083348339efd1edfece7a5f8a2385e79058a9
-  data.tar.gz: 730b06f6d008933865c86c4752b70428a3fb9a3c
+  metadata.gz: 584fb51bc86dff8160908557e0c4ff93c0db93c6
+  data.tar.gz: d37c07aaeacfd306c2d48a2a3893b8a4feb327c3
 SHA512:
-  metadata.gz: 543dd1b8120bfccf7feff548bad8233287e827911442a5aaa7bbf4b26057a3b7187fc1bf260d84820e5d641d6cc660f2cc9e6a77c07d7f7d2cb846ee9e2a4f29
-  data.tar.gz: 2518bc795d9a5085a0006eaa8ad8369adf26e7880a674ccb386d2a632a0f0c7e90711996384030b89e5a01a54b78f640b453f5cb84292fcd6a08226511328756
+  metadata.gz: de8659ad78ba58508d49a52e7fdba393460f6ae19a424f0e7f0cc1aaeb175d8f0c79ff9ebec2fb2b19b4d8810d11d85c373e125d831177f5fa961865516c1bbc
+  data.tar.gz: d89904abe80c669836dfdc7b2e52fbc60361351f7ed57a35eaf85e881a33eae72198f94d2596f8eb7094254e1dc8bef50a9a6348ed49f6193d1f0cb3234aa2a8

data/lib/wrenchmode/rack.rb

@@ -6,7 +6,7 @@ require 'ipaddr'
 module Wrenchmode
   class Rack
     CLIENT_NAME = "wrenchmode-rack"
-    VERSION = '0.0.10'
+    VERSION = '0.0.11'
 
     SWITCH_URL_KEY = "switch_url"
     TEST_MODE_KEY = "test_mode"
@@ -45,6 +45,11 @@ module Wrenchmode
       @enable_reverse_proxy = false
 
       @made_contact = false
+
+      # Use a queue with 0 or 1 items to allow the threads to communicate. When a response from the main Wrenchmode server is received,
+      # parse the JSON and put the hash in the queue. Then, the main request thread will update the underlying middleware state
+      # the next time a request is received.
+      @queue = Queue.new
     end
 
     def call(env)      
@@ -59,6 +64,15 @@ module Wrenchmode
       @check_thread ||= start_check_thread()
       sleep(0.01) while !@made_contact
 
+      # If we've gotten a new response from the server, use it
+      # to update local status
+      json = begin
+        @queue.pop(true)
+      rescue ThreadError
+        nil
+      end
+      update_status(json) if json
+
       should_display_wrenchmode = false
       if @switched
         req = ::Rack::Request.new(env)
@@ -78,9 +92,7 @@ module Wrenchmode
       end
     end      
 
-    def update_status
-      json = fetch_status
-
+    def update_status(json)
       @switch_url = json[SWITCH_URL_KEY]
       test_mode = json[TEST_MODE_KEY] || false
       @switched = json[IS_SWITCHED_KEY] && !(@ignore_test_mode && test_mode)
@@ -91,23 +103,30 @@ module Wrenchmode
         @enable_reverse_proxy = json[REVERSE_PROXY_KEY]["enabled"]
         @reverse_proxy_config = symbolize_keys(json[REVERSE_PROXY_KEY])
       end
+    end
+
+    private
 
-    rescue OpenURI::HTTPError => e
+    def fetch_status
+      inner_fetch
+    rescue Net::HTTPError => e
       log("Wrenchmode Check HTTP Error: #{e.message}")
       @switched = false
+      nil
     rescue JSON::JSONError => e
       log("Wrenchmode Check JSON Error: #{e.message}")
       @switched = false
+      nil
     rescue StandardError => e
       log("Wrenchmode Check Unknown Error: #{e.message}")
       @switched = false
+      nil
     ensure
       @made_contact = true
     end
 
-    private
-
-    def fetch_status
+    # Split this one out for easier mocking/stubbing in the specs
+    def inner_fetch
       payload = JSON.generate(build_update_package)
       body = nil
 
@@ -149,7 +168,11 @@ module Wrenchmode
     def start_check_thread
       Thread.new do
         while true do
-          update_status
+          if json = fetch_status
+            @queue.clear()
+            @queue.push(json)
+          end
+
           sleep(@check_delay_secs)
         end
       end
@@ -202,6 +225,5 @@ module Wrenchmode
     def symbolize_keys(hash)
       hash.each_with_object({}) { |(k,v), h| h[k.to_sym] = v }
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wrenchmode-rack
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Micah Wedemeyer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack