hive-runner 2.1.14 → 2.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75b2cb3db1a4e59f6dfbc43f599cabcf0fa3b280
-  data.tar.gz: 49742a9d5f45a3eef3a7e5f3ff5456d45ccf02e9
+  metadata.gz: f50a69b0bcf931b99a301b4e6db9e81d6292daa0
+  data.tar.gz: 7729887c1a100db4c45bcc28af5174780efe7d27
 SHA512:
-  metadata.gz: 1522470f23425e86683f84a72c08a96cfb2007273bf999b8b4ae3898ec5dbce0a5148b8ef13e8da24999f375cb151dca80f5aa0a3a209f8abb9caeaa4bfeec6d
-  data.tar.gz: a5e23c39abf28ebb1893acc405df5e5c59d475d8c2df504a1723ea013bfbc0b7b3ab2e7898430e624014d41ae4334fda711c6560642a83ea8b670fb6fa67113b
+  metadata.gz: 1519f6ac87ad0327098b7b226e9ccfb35e7239cfec0be50149b71e82ae6e16330fda99369f7540b294332a4fa59c1df61135ede1102d8a0f405649a3e43a3028
+  data.tar.gz: 626b597752004916c052f45831774b5c904452d1cbf3608db4e5af5b1a2e42d2c64f2496a1f133d61185cfde83197f5c4c8aa13119213614942db691d0826d4c

data/lib/hive/execution_script.rb

@@ -110,9 +110,12 @@ module Hive
     def terminate
       if @pgid
         begin
+          @log.debug "Ensuring process #{@pgid} is terminated"
           Process.kill(-9, @pgid)
+        rescue Errno::ESRCH
+          @log.debug "Process #{@pgid} already dead"
         rescue => e
-          @log.warn e
+          @log.warn "Unexpected error while terminating process #{@pgid}: #{e}"
         end
         @pgid = nil
       end

data/lib/hive/log.rb

@@ -4,6 +4,9 @@ module Hive
   # Hive logging
   # Allow logging to be written to multiple locations.
   class Log
+    attr_accessor :hive_mind
+    attr_accessor :default_progname
+
     # Create the logger:
     #
     #   # No log files will be written
@@ -34,8 +37,8 @@ module Hive
     #   log.add_logger( STDOUT, 'DEBUG' )
     def add_logger(stream, level)
       log = MonoLogger.new(stream)
-      log.formatter = proc do |severity, datetime, _progname, msg|
-        "#{severity[0, 1]} #{datetime.strftime('%Y-%m-%d %H:%M:%S')}: #{msg}\n"
+      log.formatter = proc do |severity, datetime, progname, msg|
+        "#{severity[0, 1]} #{datetime.strftime('%Y-%m-%d %H:%M:%S')} -- #{progname}: #{msg}\n"
       end
       log.level = MonoLogger.const_get(level)
       @loggers[stream] = log
@@ -51,10 +54,58 @@ module Hive
       @loggers.delete(stream)
     end
 
-    MonoLogger::Severity.constants.each do |level|
-      define_method(level.downcase) do |*args|
-        @loggers.each { |_s, l| l.send(level.downcase, *args) }
+    # These methods were originally created using define_method as they are all
+    # the same. However, blocks cannot be used with define_method.
+    def debug(*args, &block)
+      write_log('debug', *args, &block)
+    end
+
+    def info(*args, &block)
+      write_log('info', *args, &block)
+    end
+
+    def warn(*args, &block)
+      write_log('warn', *args, &block)
+    end
+
+    def error(*args, &block)
+      write_log('error', *args, &block)
+    end
+
+    def fatal(*args, &block)
+      write_log('fatal', *args, &block)
+    end
+
+    def unknown(*args, &block)
+      write_log('unknown', *args, &block)
+    end
+
+    # Currently this will clear the Hive Mind log but do nothing to the local
+    # files
+    def clear(component = nil)
+      if self.hive_mind
+        self.hive_mind.clear_state component: component
+      end
+    end
+
+    private
+    def write_log(level, *args, &block)
+      progname = ( block && args.length > 0 ) ? args[0] : @default_progname
+
+      @loggers.each do |_s, l|
+        l.send(level, progname) { block ? yield : args[0] }
+      end
+
+      if self.hive_mind
+        params = {
+          state: level,
+          component: progname,
+          message: block ? yield : args[0]
+        }
+
+        self.hive_mind.set_state params
       end
     end
+
   end
 end

data/lib/hive/register.rb

@@ -49,6 +49,11 @@ module Hive
         housekeeping
         check_controllers
         sleep Hive.config.timings.controller_loop_interval
+
+        # For the moment, clear Hive Mind logs each time
+        # TODO Something better so that warnings and errors are not hidden
+        Hive.logger.clear
+        Hive.logger.debug('Hive Mind log cleared')
       end
     end
 

data/lib/hive/worker/shell.rb

@@ -5,6 +5,7 @@ module Hive
     # The Shell worker
     class Shell < Worker
       def initialize(options = {})
+        @default_component ||= "#{self.class.to_s} [#{$$}]"
         super
       end
 
@@ -16,6 +17,10 @@ module Hive
         @options['queues'] || []
       end
 
+      # Parameters for uniquely identifying the device
+      def hive_mind_device_identifiers
+        { id: @hive_id }
+      end
     end
   end
 end

data/lib/hive/worker.rb

@@ -30,6 +30,7 @@ module Hive
       @parent_pid = @options['parent_pid']
       @device_id = @options['id']
       @hive_id = @options['hive_id']
+      @default_component ||= self.class.to_s
       @hive_mind ||= mind_meld_klass.new(
         url: Chamber.env.network.hive_mind? ? Chamber.env.network.hive_mind : nil,
         pem: Chamber.env.network.cert ? Chamber.env.network.cert : nil,
@@ -45,6 +46,8 @@ module Hive
         "#{LOG_DIRECTORY}/#{pid}.#{@device_identity}.log",
         Hive.config.logging.worker_level || 'INFO'
       )
+      @log.hive_mind = @hive_mind
+      @log.default_progname = @default_component
 
       self.update_queues
 
@@ -70,8 +73,9 @@ module Hive
           diagnostics
           update_queues
           poll_queue
+          @log.clear
         rescue DeviceNotReady => e
-          @log.info("#{e.message}\n");
+          @log.warn("#{e.message}\n");
         rescue StandardError => e
           @log.warn("Worker loop aborted: #{e.message}\n  : #{e.backtrace.join("\n  : ")}")
         end
@@ -317,7 +321,6 @@ module Hive
         end
 
         begin
-@log.info("Job: #{job.inspect}")
           if conf_file = lion_config(checkout)
             Res.submit_results(
                 reporter: :lion,

data/lib/hive.rb

@@ -54,7 +54,14 @@ module Hive
       if Hive.config.logging.console_level?
         @logger.add_logger(STDOUT, Hive.config.logging.console_level)
       end
+
+      @logger.default_progname = 'Hive core'
+    end
+
+    if ! @logger.hive_mind
+      @logger.hive_mind = @hive_mind
     end
+
     @logger
   end
 
@@ -103,6 +110,9 @@ module Hive
           )
         end
         @hive_mind.flush_statistics
+        if @logger
+          @logger.hive_mind = @hive_mind
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner
 version: !ruby/object:Gem::Version
-  version: 2.1.14
+  version: 2.1.15
 platform: ruby
 authors:
 - Joe Haig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chamber
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.12
 - !ruby/object:Gem::Dependency
   name: code_cache
   requirement: !ruby/object:Gem::Requirement