smith 0.6.5 → 0.6.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac31055456f72df45ea622260b0ca64f4827e4f4
-  data.tar.gz: 10121bb12dabdfad2bcd635c0f18ff8de26f305b
+  metadata.gz: 15e19b548b13abaa3401c8f90ac764f02d55d0e3
+  data.tar.gz: dd521bbdd079d43906581c451eabc27b6734d0a2
 SHA512:
-  metadata.gz: 7bc73bc698ffc76b75ba3a92715728216dc53eeb34cfca95693234f86cd693f799f6cebe2fc9ab74926351e88513ee22f4efd5fcac49c4497388f0f87a67b4de
-  data.tar.gz: 6fa9ee4e078d7c9c82879adef1ef4956820e79f160ec12d0cd92e27190a77d0b3f4d0df08e81fbcc462919236f7047b99b0cc168ea9f8effddf06eebf655b3d6
+  metadata.gz: 08947494f7f7c93c667a47b3649d9745fc92105441838950f3ca614becd7dfe53696ecc4623d573c93642e30a6005aa765308466727cfe90b299ea6419223454
+  data.tar.gz: a279693c851d0cbf971a656c967afff5ac65fce1b3657294a947a74df6c3c20aa20bef5aed4624426a3578dd6fffb2f574558a0127d3d0e5b113edc1b4ca8a35

data/lib/smith/agent.rb

@@ -15,8 +15,7 @@ module Smith
 
       @factory = QueueFactory.new
 
-      @signal_handlers = Hash.new { |h,k| h[k] = Array.new }
-
+      setup_signal_handlers
       setup_control_queue
 
       @start_time = Time.now
@@ -73,14 +72,46 @@ module Smith
       raise ArgumentError, "You must override this method"
     end
 
+    # Set up the mechanics required to implement the self pipe trick.
+    def setup_signal_handlers
+      @signal_handlers = Hash.new { |h,k| h[k] = Array.new }
+      @signal_handler_queue = []
+      @signal_handler_pipe_reader, @signal_handler_pipe_writer = IO.pipe
+
+      # The Module declaration here will only close over local variables so we
+      # need to assign self to a local variable to get access to the agent itself.
+      agent = self
+
+      EM.attach(@signal_handler_pipe_reader, Module.new {
+        define_method :receive_data do |_|
+
+          handlers = agent.instance_variable_get(:@signal_handlers)
+          queue = agent.instance_variable_get(:@signal_handler_queue)
+          signal = queue.pop
+
+          agent.send(:logger).debug { "Running signal handlers for agent: #{agent.name}: #{signal}" }
+          handlers[signal].each { |handler| handler.call(signal) }
+        end
+      })
+    end
+
+    # Adds a signal handler proc to the list of signal_handlers. When
+    # a signal is received all signal handlers are called in reverse order.
+    # @param signal [Integer] the signal number.
+    # @param position [Symbol] [:first|:last] where on the signal handler stack
+    #                          to put the handler proc.
+    # @see Signal.list for a full list of available signals on a system.
     def install_signal_handler(signal, position=:end, &blk)
       raise ArgumentError, "Unknown position: #{position}" if ![:beginning, :end].include?(position)
+      logger.debug { "Installing signal handler for #{signal}" }
 
-      logger.verbose { "Installing signal handler for #{signal}" }
       @signal_handlers[signal].insert((position == :beginning) ? 0 : -1, blk)
-      @signal_handlers.each do |sig, handlers|
-        trap(sig, proc { |sig| run_signal_handlers(sig, handlers) })
-      end
+
+      Signal.trap(signal) {
+        logger.debug { "Got signal: #{signal}" }
+        @signal_handler_pipe_writer.write_nonblock('.')
+        @signal_handler_queue << signal
+      }
     end
 
     def state
@@ -112,12 +143,7 @@ module Smith
       end
     end
 
-    protected
-
-    def run_signal_handlers(sig, handlers)
-      logger.debug { "Running signal handlers for agent: #{name}: #{sig}" }
-      handlers.each { |handler| handler.call(sig) }
-    end
+    private
 
     def setup_control_queue
       logger.debug { "Setting up control queue: #{control_queue_def.denormalise}" }

data/lib/smith/bootstrap.rb

@@ -8,6 +8,7 @@ $:.unshift(Pathname.new(__FILE__).dirname.parent.expand_path)
 
 require 'smith'
 require 'smith/agent'
+# require 'smith/synchronous_agent'
 
 module Smith
   class AgentBootstrap
@@ -92,7 +93,7 @@ module Smith
     private
 
     def write_pid_file
-      @pid = Daemons::PidFile.new(Daemons::Pid.dir(:normal, Dir::tmpdir, nil), ".rubymas-#{@agent_uuid.snake_case}", true)
+      @pid = Daemons::PidFile.new(Daemons::Pid.dir(:normal, Dir::tmpdir, nil), ".smith-#{@agent_uuid}", true)
       @pid.pid = Process.pid
     end
 

data/lib/smith/commands/smithctl/dump.rb

@@ -1,12 +1,10 @@
 # -*- encoding: utf-8 -*-
-require 'multi_json'
 require 'smith/messaging/queue'
 
 module Smith
   module Commands
     class Dump < CommandBase
       def execute
-        MultiJson.use(:oj)
         dump
       end
 

data/lib/smith/commands/smithctl/pop.rb

@@ -1,6 +1,4 @@
 # -*- encoding: utf-8 -*-
-require 'yajl'
-
 require 'smith/messaging/queue'
 
 module Smith

data/lib/smith/commands/smithctl/push.rb

@@ -1,7 +1,4 @@
 # -*- encoding: utf-8 -*-
-
-require 'multi_json'
-
 module Smith
   module Commands
     class Push < CommandBase

data/lib/smith/messaging/acl/default.rb

@@ -1,7 +1,4 @@
 # -*- encoding: utf-8 -*-
-
-require 'multi_json'
-
 module Smith
   module ACL
 

data/lib/smith/version.rb

@@ -1,3 +1,3 @@
 module Smith
-  VERSION = "0.6.5"
+  VERSION = "0.6.5.1"
 end

data/lib/smith.rb

@@ -6,6 +6,7 @@ require 'logging'
 require 'pathname'
 require 'protobuf'
 require 'fileutils'
+require 'multi_json'
 require 'securerandom'
 require 'extlib/string'
 require 'extlib/inflection'
@@ -15,6 +16,8 @@ require_relative 'smith/config'
 require_relative 'smith/logger'
 require_relative 'smith/acl_compiler'
 
+MultiJson.use(:oj)
+
 module Smith
   include Logger
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: smith
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.5.1
 platform: ruby
 authors:
 - Richard Heycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: amqp
   requirement: !ruby/object:Gem::Requirement