hive-runner 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55e51a2e63a369604683a34ee74662fa61d40be6
-  data.tar.gz: c84a6365d382d09fd5b65455ab2e9ad1edd30f5d
+  metadata.gz: 5e1f35dfb194e15da69701c3783c9b361aae8cce
+  data.tar.gz: 550ad209950c448230265ce37253a2b60647415f
 SHA512:
-  metadata.gz: 34826fc6647770fc07e2c1a5d54c87a6da1ced54dba570d0ba8ff446b6232e1005b9aa44efb6c50aa9b5b8d4b8345dd0f2b7c8b81b3319d041c848015d64c1e4
-  data.tar.gz: a76541f4f0b1d922c13e941875b53281fad16ef30f19458455ad3c8ad0a56fdb159bd495f684c2455917ab8b29bdc7c267bcd702749f3ea146c20417152cbea8
+  metadata.gz: 87e9b16b957655c865f843b4a1c108216ca081be9483b85fb49767aebd0524f8483a36e3dab66e81dba69e53d61b540b17246a535e0488dc39f1aa58fc694c8f
+  data.tar.gz: 61deca7a2e6f35f91046d2d1fdd010382921d9d79a97fecf96eabccf42ea5841fc5d6b881db410d42c7d7f2eb9f8c5f30125154530834d9d3d9cf36040540d5b

data/bin/start_hive

@@ -35,7 +35,7 @@ Signal.trap('USR1') do
 
   client.puts "  Software versions:"
   client.puts "    * hive-runner: #{gems['hive-runner']}"
-  gems.except('hive-runner').sort.each do |name, version|
+  gems.select{|k, v| k != 'hive-runner'}.sort.each do |name, version|
     client.puts "    * #{name}: #{version}"
   end
   

data/lib/hive.rb

@@ -5,6 +5,7 @@ require 'mind_meld/hive'
 require 'macaddr'
 require 'socket'
 require 'sys/uname'
+require 'sys/cpu'
 require 'airbrake-ruby'
 
 # The Hive automated testing framework
@@ -88,13 +89,23 @@ module Hive
     Hive.logger.debug "Polling hive"
     rtn = Hive.hive_mind.poll
     Hive.logger.debug "Return data: #{rtn}"
-    if rtn['error'].present?
+    if rtn.has_key? 'error'
       Hive.logger.warn "Hive polling failed: #{rtn['error']}"
     else
       Hive.logger.info "Successfully polled hive"
     end
   end
 
+  # Gather and send statistics
+  def self.send_statistics
+    Hive.hive_mind.add_statistics(
+      label: 'Load average',
+      value: Sys::CPU.load_avg[0],
+      format: 'float'
+    )
+    Hive.hive_mind.flush_statistics
+  end
+
   # Get the IP address of the Hive
   def self.ip_address
     ip = Socket.ip_address_list.detect { |intf| intf.ipv4_private? }

data/lib/hive/register.rb

@@ -30,17 +30,20 @@ module Hive
     end
 
     def instantiate_controllers(controller_details = Hive.config.controllers)
-      controller_details.each do |type, opts|
-        Hive.logger.info("Adding controller for '#{type}'")
-        require "hive/controller/#{type}"
-        controller = Object.const_get('Hive').const_get('Controller').const_get(type.capitalize).new(opts.to_hash)
-        @controllers << controller
+      if controller_details
+        controller_details.each do |type, opts|
+          Hive.logger.info("Adding controller for '#{type}'")
+          require "hive/controller/#{type}"
+          controller = Object.const_get('Hive').const_get('Controller').const_get(type.capitalize).new(opts.to_hash)
+          @controllers << controller
+        end
       end
       check_controllers
       @controllers
     end
 
     def run
+      @next_stat_update = Time.now
       loop do
         Hive.poll
         housekeeping
@@ -98,6 +101,11 @@ module Hive
 
     def housekeeping
       clear_workspaces
+
+      if Hive.config.timings.stats_update_interval? && @next_stat_update < Time.now
+        Hive.send_statistics
+        @next_stat_update += Hive.config.timings.stats_update_interval
+      end
     end
 
     def clear_workspaces

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Joe Haig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chamber
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.8
 - !ruby/object:Gem::Dependency
   name: code_cache
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: sys-cpu
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: airbrake-ruby
   requirement: !ruby/object:Gem::Requirement