smith 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95209344632520fac5a790a8efa4cfd91a52ddb2
-  data.tar.gz: 562bb8a1c8bd5371fdf3d74765f8c069b88f0fa0
+  metadata.gz: 9812b89c515ed71a2291f67b53a4c40c519f2afa
+  data.tar.gz: 76b9705aa9b00595d735750b240a594f7bedf79d
 SHA512:
-  metadata.gz: 2a8202bf141e34265c7254ba6dfef92d7798b8d6bd9ff7b0bc903060a27d11d86d38ba8f1b1be7aede80932f10eee31f1fd21cdb1d22655e1ffc212b039543c2
-  data.tar.gz: a5e5d205a49c1fd10ada42bf317fe17bde5cf12d375746133b909ea87892ecd7b35462f6b6c9cb8e8267872503799a8ee99ab6acaa921cac287221369d383718
+  metadata.gz: efb0730d32b544d91a744fa37f714222d073f19bb94b5474f5e21f8399f5a88ee2e5ba6d8d422691a5a6c1db9d2889ef0674bd48128b683d27eaf2f63f2cad88
+  data.tar.gz: 347b181a6d0980241797c67501ae4c42aa2a479f51577a5e41d5786de4099f6771a44bd695a7972acdca3c6fcfc45b96cf05376dcc0cbe2f7891faf6d105326a

data/bin/smithctl

@@ -39,7 +39,7 @@ module Smith
 
     def agency_command(command, args, &blk)
       Messaging::Sender.new(QueueDefinitions::Agency_control) do |sender|
-        sender.on_timeout(5) { |message_id| blk.call("Timeout. Is the agency still running?") }
+        sender.on_timeout(@timeout) { |message_id| blk.call("Timeout. Is the agency still running?") }
 
         sender.on_reply(:auto_ack => true) do |reply_payload, r|
           blk.call(reply_payload[:response])

data/lib/smith.rb

@@ -75,6 +75,7 @@ module Smith
     end
 
     def start(opts={}, &block)
+
       if EM.epoll? && Smith.config.eventmachine.epoll
         logger.debug { "Using epoll for I/O event notification." }
         EM.epoll
@@ -95,33 +96,27 @@ module Smith
         @connection = connection
 
         connection.on_connection do
-          broker = connection.broker.properties
-          endpoint = connection.broker_endpoint
-          logger.info { "Connected to: AMQP Broker: #{endpoint}, (#{broker['product']}/v#{broker['version']})" } unless opts[:quiet]
+          logger.info { "Connected to: AMQP Broker: #{broker_identifier(connection)}" } unless opts[:quiet]
         end
 
+        # FIXME This should go in the config.
+        reconnection_delay = 5
+
         connection.on_tcp_connection_loss do |connection, settings|
-          EM.next_tick do
-            logger.error { "TCP connection error. Attempting restart" }
-            connection.reconnect
-          end
+          logger.info { "Reconnecting to AMQP Broker: #{broker_identifier(connection)} in #{reconnection_delay}s" }
+          connection.reconnect(false, reconnection_delay)
         end
 
-        connection.after_recovery do
-          logger.info { "Connection to AMQP server restored" }
+        connection.after_recovery do |connection|
+          logger.info { "Connection with AMQP Broker restored: #{broker_identifier(connection)}" } unless opts[:quiet]
         end
 
         connection.on_error do |connection, connection_close|
-          case connection_close.reply_code
-          when 320
-            logger.warn { "AMQP server shutdown. Waiting." }
+          # If the broker is gracefully shutdown we get a 320. Log a nice message.
+          if connection_close.reply_code == 320
+            logger.warn { "AMQP Broker shutdown: #{broker_identifier(connection)}" }
           else
-            if @handler
-              @handler.call(connection, reason)
-            else
-              logger.error { "AMQP Server error: #{connection_close.reply_code}: #{connection_close.reply_text}" }
-              EM.stop_event_loop
-            end
+            logger.warn {  connection_close.reply_text }
           end
         end
 
@@ -190,6 +185,11 @@ module Smith
       end
     end
 
+    def broker_identifier(connection)
+      broker = connection.broker.properties
+      "#{connection.broker_endpoint}, (#{broker['product']}/v#{broker['version']})"
+    end
+
     def check_path(path, create=false)
       unless path.exist?
         error_message = "Path does not exist: #{path}"

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

@@ -26,7 +26,7 @@ module Smith
       end
 
       def long_format(a)
-        a.map do |a|
+        a.sort { |a, b| a.name <=> b.name }.map do |a|
           [a.state, a.uuid, a.pid, (a.started_at) ? format_time(a.started_at) : '', (!(a.stopped? || a.null?) && !a.alive?) ? '(agent dead)' : "", a.name]
         end
       end

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

@@ -4,14 +4,21 @@ module Smith
   module Commands
     class Firehose < CommandBase
       def execute
-        queue_name = target.first
+        queue_name = target.first || '#'
         AMQP::Channel.new(Smith.connection) do |channel,ok|
           channel.topic('amq.rabbitmq.trace', :durable => true) do |exchange|
             channel.queue('smith.firehose', :durable => true) do |queue|
-              queue.bind(exchange, :routing_key => "publish.#{Smith.config.smith.namespace}.#{queue_name}").subscribe do |m,p|
-                clazz = @acl_type_cache.get_by_hash(m.headers['properties']['type'])
-                message = clazz.new.parse_from_string(data)
-                puts (options[:json_given]) ? message.to_json : message.inspect
+              if correct_direction?
+                routing_key = "#{options[:direction]}.#{Smith.config.smith.namespace}.#{queue_name}"
+
+                queue.bind(exchange, :routing_key => routing_key).subscribe do |m, payload|
+                  acl_type_cache = AclTypeCache.instance
+                  clazz = acl_type_cache.get_by_hash(m.headers['properties']['type'])
+                  message = {options[:direction] => clazz.new.parse_from_string(payload)}
+                  puts (options[:json_given]) ? message.to_json : message.inspect
+                end
+              else
+                responder.succeed("--direction must be either deliver or publish")
               end
             end
           end
@@ -24,7 +31,12 @@ module Smith
              "  You _must_ run 'rabbitmqctl trace_on' for this to work."]
         banner b.join("\n")
 
-        opt    :json ,  "return the JSON representation of the message", :short => :j
+        opt    :json,       "return the JSON representation of the message", :short => :j
+        opt    :direction,  "Show messages that are leaving the broker [deliver|publish]", :short => :d, :type => :string, :default => 'deliver'
+      end
+
+      def correct_direction?
+        options[:direction] == 'deliver' || options[:direction] == 'publish'
       end
     end
   end

data/lib/smith/config.rb

@@ -149,7 +149,7 @@ module Smith
       if conf.exist?
         return conf
       else
-        if path == Pathname.new(ENV['HOME'])
+        if path == Pathname.new(ENV['HOME']) || path.root?
           raise ConfigNotFoundError, "Cannot find a usable config file."
         end
         find_config_file(path.dirname)

data/lib/smith/version.rb

@@ -1,3 +1,3 @@
 module Smith
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: smith
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Richard Heycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: extlib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.15
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.7.7
 - !ruby/object:Gem::Dependency
@@ -112,70 +112,70 @@ dependencies:
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.16.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.16.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: tdb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: murmurhash3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple multi-agent framework. It uses AMQP for it's messaging layer.
@@ -195,22 +195,22 @@ files:
 - lib/smith/commands/agency/metadata.rb
 - lib/smith/commands/agency/version.rb
 - lib/smith/commands/agency/kill.rb
-- lib/smith/commands/agency/list.rb
-- lib/smith/commands/agency/logger.rb
 - lib/smith/commands/agency/object_count.rb
 - lib/smith/commands/agency/restart.rb
 - lib/smith/commands/agency/start.rb
 - lib/smith/commands/agency/stop.rb
+- lib/smith/commands/agency/logger.rb
+- lib/smith/commands/agency/list.rb
 - lib/smith/commands/smithctl/commands.rb
 - lib/smith/commands/smithctl/pop.rb
 - lib/smith/commands/smithctl/rm.rb
 - lib/smith/commands/smithctl/subscribe.rb
 - lib/smith/commands/smithctl/acl.rb
 - lib/smith/commands/smithctl/dump.rb
-- lib/smith/commands/smithctl/firehose.rb
 - lib/smith/commands/smithctl/push.rb
 - lib/smith/commands/smithctl/status.rb
 - lib/smith/commands/smithctl/top.rb
+- lib/smith/commands/smithctl/firehose.rb
 - lib/smith/commands/template.rb
 - lib/smith/commands/common.rb
 - lib/smith/messaging/acl/agent_command.proto
@@ -226,36 +226,37 @@ files:
 - lib/smith/messaging/amqp_options.rb
 - lib/smith/messaging/message_counter.rb
 - lib/smith/messaging/queue_factory.rb
-- lib/smith/messaging/acl_type_cache.rb
 - lib/smith/messaging/factory.rb
 - lib/smith/messaging/queue.rb
+- lib/smith/messaging/requeue.rb
+- lib/smith/messaging/util.rb
+- lib/smith/messaging/acl_type_cache.rb
 - lib/smith/messaging/queue_definition.rb
 - lib/smith/messaging/receiver.rb
-- lib/smith/messaging/requeue.rb
 - lib/smith/messaging/sender.rb
-- lib/smith/messaging/util.rb
 - lib/smith/agent_config.rb
 - lib/smith/object_count.rb
 - lib/smith/amqp_errors.rb
 - lib/smith/command_base.rb
-- lib/smith/acl_compiler.rb
+- lib/smith/bootstrap.rb
+- lib/smith/config.rb
+- lib/smith/queue_definitions.rb
 - lib/smith/acl_parser.rb
 - lib/smith/agent.rb
 - lib/smith/agent_cache.rb
 - lib/smith/agent_monitoring.rb
 - lib/smith/agent_process.rb
-- lib/smith/bootstrap.rb
 - lib/smith/cache.rb
-- lib/smith/command.rb
-- lib/smith/config.rb
-- lib/smith/daemon.rb
 - lib/smith/exceptions.rb
 - lib/smith/logger.rb
-- lib/smith/queue_definitions.rb
+- lib/smith/acl_compiler.rb
+- lib/smith/command.rb
+- lib/smith/daemon.rb
 - lib/smith/version.rb
 - lib/smith.rb
 homepage: http://github.com/filterfish/smith2
-licenses: []
+licenses:
+- GPL-3
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -263,12 +264,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []