hirefire-resource 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3707ebd2fc7528f274027a9089e6c9a68f8371f23ddcf83bb367ebe594972667
-  data.tar.gz: ec772d13937e655834c9863380c8c651a9d2847a0598841c6763b61b21cc2568
+  metadata.gz: e583f65c0c003cc4543482e3730952319ddc0069d97332f4f40b85701f61eebd
+  data.tar.gz: efdc10ea1bf9f75333e4605a4ffbc7dd63e40d3e198a552badfb1a79bad21697
 SHA512:
-  metadata.gz: 59e4930d3819da8e2c3f6e5903e12683a2eba0c4514f07ab0eb9ed65f80d0a71ebf6f2949e1445ca5b6165c477a4e0aa87e2c994f21afe37bddfbe69e1cde76f
-  data.tar.gz: f7f1395eb1d880ec10a5344c409216017156d2ae977157968fe99de800ba594ae2621ed44173becf809b4872efbc256e175761d3c7147369d05630a2fd90dddf
+  metadata.gz: 03fe9362bc04329ad02fccb8cc2836176bfbd1d06cef683a24dffa12f399386b592efcc1e8271b854c766a3c495a7d9abeda9e0736d59c86cda38723379c5690
+  data.tar.gz: b80ca0e325253750e54771f9dcf03e60e88c99b999b2dff0f7b596186c23356095dad90fd5ddc0bde1c2ec57fd6cf2475f3d8452c260467f9ef9f7730aaffeef

data/hirefire-resource.gemspec

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

data/lib/hirefire/middleware.rb

@@ -108,7 +108,7 @@ module HireFire
     # @param [String] the timestamp from HTTP_X_REQUEST_START.
     #
     def handle_queue(value)
-      log_queue(value) if value
+      HireFire::Resource.log_queue_metrics && value && log_queue(value)
     end
 
     # Writes the Heroku Router queue time to STDOUT.
@@ -126,7 +126,8 @@ module HireFire
     # @return [Integer] the queue time in milliseconds.
     #
     def get_queue(value)
-      (Time.now.to_f * 1000).to_i - value.to_i
+      ms = (Time.now.to_f * 1000).to_i - value.to_i
+      ms < 0 ? 0 : ms
     end
   end
 end

data/lib/hirefire/resource.rb

@@ -4,14 +4,30 @@ module HireFire
   module Resource
     extend self
 
+    # This option, when enabled, will write queue metrics to STDOUT,
+    # and is only required when using the Web.Logplex.QueueTime strategy.
+    #
+    # @param [Boolean] Whether or not the queue metrics should be logged.
+    #
+    attr_writer :log_queue_metrics
+
+    # @return [Boolean] True if the queue metrics option is enabled.
+    #
+    def log_queue_metrics
+      @log_queue_metrics ||= false
+    end
+
     # @return [Array] The configured dynos.
     #
-    attr_accessor :dynos
+    def dynos
+      @dynos ||= []
+    end
 
-    # Sets the `@dynos` instance variable to an empty Array to hold all the dyno configuration.
+    # Configures HireFire::Resource.
     #
     # @example Resource Configuration
     #   HireFire::Resource.configure do |config|
+    #     config.log_queue_metrics = true # disabled by default
     #     config.dyno(:worker) do
     #       # Macro or Custom logic for the :worker dyno here..
     #     end
@@ -20,7 +36,6 @@ module HireFire
     # @yield [HireFire::Resource] to allow for block-style configuration.
     #
     def configure
-      @dynos ||= []
       yield self
     end
 
@@ -30,8 +45,7 @@ module HireFire
     # @param [Proc] block an Integer containing the quantity calculation logic.
     #
     def dyno(name, &block)
-      @dynos << { :name => name, :quantity => block }
+      dynos << { :name => name, :quantity => block }
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hirefire-resource
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies: []
 description: Load- and schedule-based scaling for web- and worker dynos
 email: michael@hirefire.io