hive-runner 2.1.17 → 2.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4704758c41182147429e0d686f6aac6f9fbfbde
-  data.tar.gz: 4b53978303fb1d7a890b26b642a090d30af50f6a
+  metadata.gz: 864b65e5afdbe315bab0de8d11dd5a85cfcea66c
+  data.tar.gz: 41d1edb5fcdadb28c39c6703cbe94dfbf1095d1c
 SHA512:
-  metadata.gz: f272540c420ddd01528d609cf746219032a5137ca4263f9a7dfa554e48f60130da34ad53784b8e6069985cee3eab99de963c7c72c98ac217726095acfed4ff0a
-  data.tar.gz: 5d33248ba5945404a8097e1e091cda6fa400d0dd1feedc9437bb2387943d6afa42a836a51d434b918009f98f6729c8af3540a0335c7bd041896605ce3e8b03e3
+  metadata.gz: c01583109668be9ea0eda6f1c1c7200fa9601df84b150ee4a01e8392c067a427659aacb20ec8d3f685a895155d0c0a03e98cbd729bb754d398eef0364c346638
+  data.tar.gz: a9382cc9ac7ba6aa4c6a9fb38d23c71e6e495d830a8f114ff0f54e92520597ffbbbf97c2e9eb35c9b1fb1934f28922d463284290295326a0bb2ded576db42cf1

data/lib/hive/diagnostic.rb

@@ -10,11 +10,12 @@ module Hive
     attr_accessor :last_run
     attr_reader :config, :device_api
 
-    def initialize(config, options)
+    def initialize(config, options, hive_mind=nil)
       @options = options
       @config = config
       @serial = @options['serial']
       @device_api = @options['device_api']
+      @hive_mind = hive_mind
     end
 
     def should_run?
@@ -30,25 +31,25 @@ module Hive
     end
 
     def run
-      Hive.logger.info("Trying to run diagnostic '#{self.class}'")
+      Hive.logger.debug("Trying to run diagnostic '#{self.class}'")
       if should_run?  
         result = diagnose 
         result = repair(result) if result.failed?
         @last_run = result
       else
-        Hive.logger.info("Diagnostic '#{self.class}' last ran less than five minutes before")
+        Hive.logger.debug("Diagnostic '#{self.class}' last ran less than five minutes before")
       end
       @last_run 
     end
 
     def pass(message= {}, data = {})
-      Hive.logger.info(message)
-      Hive::Results.new("pass", message, data )
+      Hive.logger.info("#{@device_api.serial_no} => #{message} #{data}")
+      Hive::Results.new("pass", message, data, @hive_mind)
     end
 
     def fail(message ={}, data = {})
-      Hive.logger.info(message)
-      Hive::Results.new("fail", message, data)
+      Hive.logger.info("#{@device_api.serial_no} => #{message} #{data}")
+      Hive::Results.new("fail", message, data, @hive_mind)
     end
   end
-end
+end

data/lib/hive/diagnostic_runner.rb

@@ -2,9 +2,10 @@ module Hive
   class DiagnosticRunner
     attr_accessor :diagnostics, :options
 
-    def initialize(options, diagnostics_config, platform)
+    def initialize(options, diagnostics_config, platform, hive_mind=nil)
       @options = options
       @platform = platform
+      @hive_mind = hive_mind
       @diagnostics = self.initialize_diagnostics(diagnostics_config[@platform]) if diagnostics_config.has_key?(@platform)
     end
 
@@ -13,7 +14,7 @@ module Hive
         @diagnostics = diagnostics_config.collect do |component, config|
           Hive.logger.info("Initializing #{component.capitalize} component for #{@platform.capitalize} diagnostic")
           require "hive/diagnostic/#{@platform}/#{component}"
-          Object.const_get('Hive').const_get('Diagnostic').const_get(@platform.capitalize).const_get(component.capitalize).new(config, @options)
+          Object.const_get('Hive').const_get('Diagnostic').const_get(@platform.capitalize).const_get(component.capitalize).new(config, @options, @hive_mind)
         end
       else
         Hive.logger.info("No diagnostic specified for #{@platform}")

data/lib/hive/results.rb

@@ -1,12 +1,13 @@
-
 module Hive
   class Results
     attr_reader :timestamp
-    def initialize( state, message, data = {})
+    def initialize( state, message, data = {}, hive_mind=nil)
       @state = state
       @message = message
       @data = data  
       @timestamp = Time.now
+      @hive_mind = hive_mind
+      submit_results
     end
   
     def failed?
@@ -16,5 +17,32 @@ module Hive
     def passed?
       @state == 'pass'
     end
+
+    def formulate_results
+       result = []
+       h = {}
+       @data.each do |k,v|
+         h[:label] = k.to_s
+         h[:unit] = v[:unit] || nil
+         if v[:value].instance_of?(Time)
+           h[:value] = v[:value].to_i
+           h[:format] = 'timestamp'
+         else
+           h[:value] = v[:value]
+           h[:format] = 'integer'
+         end
+         result << h
+         h = {}
+       end
+       result
+    end
+
+    def submit_results
+       if @hive_mind
+      	 @hive_mind.add_statistics(formulate_results)
+      	 @hive_mind.flush_statistics
+       end
+    end
+
   end
-end
+end

data/lib/hive/worker.rb

@@ -54,7 +54,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? && Hive.config.diagnostics[platform]
+      @diagnostic_runner = Hive::DiagnosticRunner.new(@options, Hive.config.diagnostics, platform, @hive_mind) if Hive.config.diagnostics? && Hive.config.diagnostics[platform]
 
       Hive::Messages.configure do |config|
         config.base_path = Hive.config.network.scheduler
@@ -70,10 +70,10 @@ module Hive
       @log.info('Starting worker')
       while keep_running?
         begin
+          @log.clear
           diagnostics
           update_queues
           poll_queue
-          @log.clear
         rescue DeviceNotReady => e
           @log.warn("#{e.message}\n");
         rescue StandardError => e

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner
 version: !ruby/object:Gem::Version
-  version: 2.1.17
+  version: 2.1.18
 platform: ruby
 authors:
 - Joe Haig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chamber
@@ -305,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Hive Runner