hirefire-resource 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e74599dff2d7b0509fc068e143312336e854e3c2
-  data.tar.gz: d515af29724dbaff66c7f3fb24fd73c22a83c4c5
+SHA256:
+  metadata.gz: 33c33c7654d2bec9a8f5a0325c508fcf1314555f1409f693808189057558a71f
+  data.tar.gz: dc51a264bac728b99397178bbf741d7b61589d57d9cdf6fb40ade130bdf51b22
 SHA512:
-  metadata.gz: 9d43c787528213ec9956e16a804f407c106db4eba0f6f2c38d3f27626f8e81e7cd2b6d0f2419d3fd93d658736a80f275c6d71a046328b2429c79f603b0a96966
-  data.tar.gz: 83fa2527ebf43e28fb7b6939f595c8c8715922404601ce1de488acd6534301e41f40038253e6d4935e94c1d1940c6247351dc61e3376bd09d2d95ca0696b29c2
+  metadata.gz: 10103ce68c4fb42249f533cc89b824a8ec200c4fb04ebfb059f3949cae0b7dda53eb2005d8c763dab431619be794fd9307847d4b57909c16d8bf0ba775378cb3
+  data.tar.gz: edaee01b36999e985f8f2858f81c99f89d119705b0e4a840190bb2d70cd282b4d86874501373992aabee7ca02534949fb6fa193cde119c5151d1d8b047a5b720

data/README.md

@@ -1,6 +1,6 @@
-## [HireFire](http://hirefire.io/) - Autoscaling for your Heroku dynos
+## [HireFire](https://www.hirefire.io/) - Autoscaling for your Heroku dynos
 
-Load-based scaling, schedule-based scaling, dyno crash recovery, for [Heroku](http://heroku.com/) web- and worker dynos.
+Load-based scaling, schedule-based scaling, dyno crash recovery, for [Heroku](https://www.heroku.com/) web- and worker dynos.
 
 ---
 
@@ -27,7 +27,7 @@ It supports practically any Rack-based application or framework, such as:
 We provide convenient macros for the above mentioned worker libraries to calculate the queue size for each of them.
 If you wish to conribute more macros for other existing worker libraries feel free to send us a pull request.
 
-Here is an example with Ruby on Rails 3. 
+Here is an example with Rails 3+
 
 First, add the gem to your `Gemfile`:
 
@@ -83,7 +83,7 @@ dj_worker: QUEUES=encode,compress bundle exec rake jobs:work
 
 Now that HireFire will scale both of the these dyno types based on their individual queue sizes. To customize how they scale, log in to the HireFire web interface.
 
-Visit the [official website](http://www.hirefire.io/) for more information!
+Visit the [official website](https://www.hirefire.io/) for more information!
 
 ### License
 

data/hirefire-resource.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name = "hirefire-resource"
-  gem.version = "0.4.2"
+  gem.version = "0.5.0"
   gem.platform = Gem::Platform::RUBY
   gem.authors = "Michael van Rooijen"
   gem.email = "michael@hirefire.io"

data/lib/hirefire/middleware.rb

@@ -33,6 +33,8 @@ module HireFire
     def call(env)
       @env = env
 
+      handle_queue(env["HTTP_X_REQUEST_START"])
+
       if test?
         [ 200, TEST_HEADERS, self ]
       elsif info?
@@ -66,14 +68,17 @@ module HireFire
     #
     def dynos
       dyno_data = HireFire::Resource.dynos.inject(String.new) do |json, dyno|
-        json << %|,{"name":"#{dyno[:name]}","quantity":#{dyno[:quantity].call || "null"}}|; json
+        json << %(,{"name":"#{dyno[:name]}","quantity":#{dyno[:quantity].call || "null"}})
+        json
       end
 
       "[#{dyno_data.sub(",","")}]"
     end
 
-
     # Rack PATH_INFO with any RAILS_RELATIVE_URL_ROOT stripped off
+    #
+    # @return [String]
+    #
     def path
       if @path_prefix
         @env["PATH_INFO"].gsub(@path_prefix, "")
@@ -97,5 +102,31 @@ module HireFire
     def info?
       path == "/hirefire/#{@token || "development"}/info"
     end
+
+    # Writes the Heroku Router queue time to STDOUT if a String was provided.
+    #
+    # @param [String] the timestamp from HTTP_X_REQUEST_START.
+    #
+    def handle_queue(value)
+      log_queue(value) if value
+    end
+
+    # Writes the Heroku Router queue time to STDOUT.
+    #
+    # @param [String] the timestamp from HTTP_X_REQUEST_START.
+    #
+    def log_queue(value)
+      STDOUT.puts("[hirefire:router] queue=#{get_queue(value)}ms")
+    end
+
+    # Calculates the difference, in milliseconds, between the
+    # HTTP_X_REQUEST_START time and the current time.
+    #
+    # @param [String] the timestamp from HTTP_X_REQUEST_START.
+    # @return [Integer] the queue time in milliseconds.
+    #
+    def get_queue(value)
+      (Time.now.to_f * 1000).to_i - value.to_i
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hirefire-resource
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies: []
 description: Load- and schedule-based scaling for web- and worker dynos
 email: michael@hirefire.io
@@ -57,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Autoscaling for your Heroku dynos