hive-runner 2.1.4 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e1f35dfb194e15da69701c3783c9b361aae8cce
-  data.tar.gz: 550ad209950c448230265ce37253a2b60647415f
+  metadata.gz: 287f96b063a4dda67c33db3f8b8cc0bfecd9ba56
+  data.tar.gz: ea25450f467474ae8ec30288dd0260d483ebf797
 SHA512:
-  metadata.gz: 87e9b16b957655c865f843b4a1c108216ca081be9483b85fb49767aebd0524f8483a36e3dab66e81dba69e53d61b540b17246a535e0488dc39f1aa58fc694c8f
-  data.tar.gz: 61deca7a2e6f35f91046d2d1fdd010382921d9d79a97fecf96eabccf42ea5841fc5d6b881db410d42c7d7f2eb9f8c5f30125154530834d9d3d9cf36040540d5b
+  metadata.gz: 27f1ff0b9143a2e8ed92c2bb8341829c39f091e11ad8b6d60e7effa2df075ae58ec40bf6363f393fe9043c4049eac5ddf51752a5fe418f7de65b426d9cf0b0b6
+  data.tar.gz: bd19118416c3ebe305c41a41e92eb29204a454850f62a21577cc034d516bcb4735088cfbdcfa005a050a7b9ae878f2f812b518a000345c3f3605bc44519150b1

data/lib/hive/worker.rb

@@ -51,7 +51,7 @@ module Hive
       @port_allocator = (@options.has_key?('port_allocator') ? @options['port_allocator'] : Hive::PortAllocator.new(ports: []))
       
       platform = self.class.to_s.scan(/[^:][^:]*/)[2].downcase
-      @diagnostic_runner = Hive::DiagnosticRunner.new(@options, Hive.config.diagnostics, platform) if !Hive.config["diagnostics"].nil?
+      @diagnostic_runner = Hive::DiagnosticRunner.new(@options, Hive.config.diagnostics, platform) if Hive.config.diagnostics? && Hive.config.diagnostics[platform]
 
       Hive::Messages.configure do |config|
         config.base_path = Hive.config.network.scheduler

data/lib/hive.rb

@@ -7,6 +7,7 @@ require 'socket'
 require 'sys/uname'
 require 'sys/cpu'
 require 'airbrake-ruby'
+require 'etc'
 
 # The Hive automated testing framework
 module Hive
@@ -60,24 +61,51 @@ module Hive
   def self.hive_mind
     Hive.logger.debug "Sysname: #{Sys::Uname.sysname}"
     Hive.logger.debug "Release: #{Sys::Uname.release}"
-    @hive_mind ||= MindMeld::Hive.new(
-      url: Chamber.env.network.hive_mind? ? Chamber.env.network.hive_mind : nil,
-      pem: Chamber.env.network.cert ? Chamber.env.network.cert : nil,
-      ca_file: Chamber.env.network.cafile ? Chamber.env.network.cafile : nil,
-      verify_mode: Chamber.env.network.verify_mode ? Chamber.env.network.verify_mode : nil,
-      device: {
-        hostname: Hive.hostname,
-        version: Gem::Specification.find_by_name('hive-runner').version.to_s,
-        runner_plugins: Hash[Gem::Specification.all.select{ |g| g.name =~ /hive-runner-/ }.map { |p| [p.name, p.version.to_s] }],
-        macs: Mac.addrs,
-        ips: [Hive.ip_address],
-        brand: Hive.config.brand? ? Hive.config.brand : 'BBC',
-        model: Hive.config.model? ? Hive.config.model : 'Hive',
-        operating_system_name: Sys::Uname.sysname,
-        operating_system_version: Sys::Uname.release,
-        device_type: 'Hive'
-      }
-    )
+    if ! @hive_mind
+      if @hive_mind = MindMeld::Hive.new(
+        url: Chamber.env.network.hive_mind? ? Chamber.env.network.hive_mind : nil,
+        pem: Chamber.env.network.cert ? Chamber.env.network.cert : nil,
+        ca_file: Chamber.env.network.cafile ? Chamber.env.network.cafile : nil,
+        verify_mode: Chamber.env.network.verify_mode ? Chamber.env.network.verify_mode : nil,
+        device: {
+          hostname: Hive.hostname,
+          version: Gem::Specification.find_by_name('hive-runner').version.to_s,
+          runner_plugins: Hash[Gem::Specification.all.select{ |g| g.name =~ /hive-runner-/ }.map { |p| [p.name, p.version.to_s] }],
+          macs: Mac.addrs,
+          ips: [Hive.ip_address],
+          brand: Hive.config.brand? ? Hive.config.brand : 'BBC',
+          model: Hive.config.model? ? Hive.config.model : 'Hive',
+          operating_system_name: Sys::Uname.sysname,
+          operating_system_version: Sys::Uname.release,
+          device_type: 'Hive'
+        }
+      ) and Etc.respond_to?(:nprocessors) # Require Ruby >= 2.2
+        @hive_mind.add_statistics(
+          label: 'Processor count',
+          value: Etc.nprocessors,
+          format: 'integer'
+        )
+        if Chamber.env.diagnostics.hive.load_warning? && Chamber.env.diagnostics.hive.load_error?
+          @hive_mind.add_statistics(
+            [
+              {
+                label: 'Load average warning threshold',
+                value: Chamber.env.diagnostics.hive.load_warning,
+                format: 'float'
+              },
+              {
+                label: 'Load average error threshold',
+                value: Chamber.env.diagnostics.hive.load_error,
+                format: 'float'
+              }
+            ]
+          )
+        end
+        @hive_mind.flush_statistics
+      end
+    end
+
+    @hive_mind
   end
 
   def self.register

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.6
 platform: ruby
 authors:
 - Joe Haig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chamber