smith 0.6.7 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac264c23960916b555109d48e592a8560447182f
-  data.tar.gz: 424cd6d244fbdce54cffce746aeb4f81635515e8
+  metadata.gz: 611c4332fcd1fcb21d1cb27a7792a4d2fb995454
+  data.tar.gz: f011eccef4892c74c23f1b37d717a5b3ad1f02e6
 SHA512:
-  metadata.gz: 9e73b594b540c6d136a5e9ed783531aa378603b28a0f1caa408e40a0f412d7583437b42b21fbcb14ec7566a6f339183a20f5dc51b7e823ea8970dd5ff8b98ff9
-  data.tar.gz: 894a371746a71b6af111614db36c5a6f9f58e6f070f2bbb2b1e16f6eba97904d16f1fd334e56ea335bd4058de372adff0b7123c4365eb8b1dfd206a750d3cfc0
+  metadata.gz: bb5a684361c835dadcd48020ec179739196535db0574c53c9cbd1268234947a356dcfa90788d8cb68288b3dd090e7028ff8b008d2017497f68fa913c18fca207
+  data.tar.gz: 1a0503cf8910994d9ae66865857aedf74b54e54aec1e390ba5c6c315084b8bfdf19e91d2694fa94a74cfe1bca53c3550a6ab82f9bab23fa7c01048fb3a84f3f4

data/bin/agency

@@ -32,13 +32,6 @@ module Smith
         logger.info { "Shutting down" }
       end
 
-      # Setup signal handlers to clean up.
-      %w{TERM INT QUIT}.each do |sig|
-        trap sig, proc {
-          logger.info { "Shutting down" }
-          @agency.stop
-        }
-      end
     end
 
     def run
@@ -49,6 +42,14 @@ module Smith
 
       Smith.compile_acls
       Smith.start do
+
+        signal_handler = SelfPipe.new(self)
+        # Setup signal handlers to clean up.
+
+        %w{TERM INT QUIT}.each do |sig|
+          signal_handler.install_signal_handler(sig) { @agency.stop }
+        end
+
         # This block is here so the that the shutdown hook added in
         # Smith.start runs last. Yes I know this is leaky but that's how
         # it is at the moment.

data/bin/smithctl

@@ -94,6 +94,14 @@ Usage:
   control = SmithControl.new(opts)
 
   Smith.start do
+
+    signal_handler = SelfPipe.new(self)
+    # Setup signal handlers to clean up.
+
+    %w{TERM INT QUIT}.each do |sig|
+      signal_handler.install_signal_handler(sig) { @agency.stop }
+    end
+
     control.send_command(command, args) do |result|
       puts result if result && !result.empty?
       Smith.stop(true)

data/lib/smith.rb

@@ -209,6 +209,7 @@ module Smith
 end
 
 require 'smith/utils'
+require 'smith/self_pipe'
 require 'smith/amqp_errors'
 require 'smith/object_count'
 require 'smith/cache'

data/lib/smith/agent.rb

@@ -15,7 +15,8 @@ module Smith
 
       @factory = QueueFactory.new
 
-      setup_signal_handlers
+      @signal_handler = SelfPipe.new(self)
+
       setup_control_queue
 
       @start_time = Time.now
@@ -25,6 +26,7 @@ module Smith
       @on_stopping = proc {|completion| completion.succeed }
       @on_starting = proc {|completion| completion.succeed }
       @on_running = proc {|completion| completion.succeed }
+      @on_exception = proc {}
 
       @on_starting_completion = EM::Completion.new.tap do |c|
         c.completion do |completion|
@@ -67,50 +69,27 @@ module Smith
       @on_running = blk
     end
 
+    # The agent may hook into this if they want to do something on exception.
+    # It should be noted that, since an exception occured, the reactor will not
+    # be running at this point. Even if we restarted the reactor before calling
+    # this it would be a different reactor than existed when assigning the
+    # block so this would potentially lead to confusion. If the agent really
+    # needs the reactor to do something it can always restart the reactor
+    # itself.
+    #
+    # @param blk [Block] This block will be passed the exception as an
+    #   argument.
+    def on_exception(&blk)
+      @on_exception = blk
+    end
+
     # Override this method to implement your own agent.
     def run
       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}" }
-
-      @signal_handlers[signal].insert((position == :beginning) ? 0 : -1, blk)
-
-      Signal.trap(signal) {
-        @signal_handler_pipe_writer.write_nonblock('.')
-        @signal_handler_queue << signal
-      }
+      @signal_handler.install_signal_handler(signal, position=:end, &blk)
     end
 
     def state
@@ -239,5 +218,9 @@ module Smith
     def control_queue_def
       @control_queue_def ||= QueueDefinitions::Agent_control.call(uuid)
     end
+
+    def __exception_handler(exception)
+      @on_exception.call(exception)
+    end
   end
 end

data/lib/smith/bootstrap.rb

@@ -65,7 +65,9 @@ module Smith
     # be running. So it must be restarted and then shutdown again
     # See the note at the in main.
     def terminate!(exception=nil)
-      logger.error { format_exception(exception) } if exception
+
+      @agent.__send__(:__exception_handler, exception)
+      logger.error { format_exception(exception) }
       logger.error { "Terminating: #{@agent_uuid}." }
 
       if Smith.running?

data/lib/smith/commands/agency/list.rb

@@ -1,7 +1,13 @@
 # -*- encoding: utf-8 -*-
+
+require_relative '../common'
+
 module Smith
   module Commands
     class List < CommandBase
+
+      include Common
+
       def execute
         if target.size > 0
           selected_agents = agents.find_by_name(target)
@@ -9,6 +15,11 @@ module Smith
           selected_agents = (options[:all]) ? agents.to_a : agents.state(:running)
         end
 
+        if options[:group]
+          group_names = agent_group(options[:group])
+          selected_agents = selected_agents.select { |a| group_names.include?(a.name) }
+        end
+
         responder.succeed((selected_agents.empty?) ? '' : format(selected_agents, options[:long]))
       end
 
@@ -51,6 +62,7 @@ module Smith
         banner "List the running agents."
 
         opt         :long,       "the number of times to send the message", :short => :l
+        opt         :group,      "list only agents in this group", :type => :string, :short => :g
         opt         :one_column, "the number of times to send the message", :short => :s
         opt         :all,        "show all agents in all states", :short => :a
 

data/lib/smith/self_pipe.rb

@@ -0,0 +1,55 @@
+module Smith
+  class SelfPipe
+
+    include Smith::Logger
+
+    def initialize(agent)
+      @agent = agent
+
+      @signal_handlers = Hash.new { |h,k| h[k] = Array.new }
+      @signal_handler_queue = []
+      @signal_handler_pipe_reader, @signal_handler_pipe_writer = IO.pipe
+
+      setup_signal_handlers
+    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}" }
+
+      @signal_handlers[signal].insert((position == :beginning) ? 0 : -1, blk)
+
+      Signal.trap(signal) {
+        @signal_handler_pipe_writer.write_nonblock('.')
+        @signal_handler_queue << signal
+      }
+    end
+
+    # Set up the mechanics required to implement the self pipe trick.
+    def setup_signal_handlers
+      # 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.
+      clazz = self
+
+      EM.attach(@signal_handler_pipe_reader, Module.new {
+        define_method :receive_data do |_|
+
+          handlers = clazz.instance_variable_get(:@signal_handlers)
+          queue = clazz.instance_variable_get(:@signal_handler_queue)
+          signal = queue.pop
+
+          clazz.send(:logger).debug { "Running signal handlers for: #{signal}" }
+          handlers[signal].each { |handler| handler.call(signal) }
+        end
+      })
+    end
+  end
+end

data/lib/smith/version.rb

@@ -1,3 +1,3 @@
 module Smith
-  VERSION = "0.6.7"
+  VERSION = "0.6.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smith
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.9
 platform: ruby
 authors:
 - Richard Heycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-30 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -254,6 +254,7 @@ files:
 - lib/smith/messaging/util.rb
 - lib/smith/object_count.rb
 - lib/smith/queue_definitions.rb
+- lib/smith/self_pipe.rb
 - lib/smith/utils.rb
 - lib/smith/version.rb
 homepage: http://github.com/filterfish/smith2
@@ -276,9 +277,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: smith
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Multi-agent framework
 test_files: []
-has_rdoc: false