smith 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b15b0f5502947a211eac261f595a91abae778941
-  data.tar.gz: ee098f6e8ce36b909cfd0c521b7208f73ca89798
+  metadata.gz: ac31055456f72df45ea622260b0ca64f4827e4f4
+  data.tar.gz: 10121bb12dabdfad2bcd635c0f18ff8de26f305b
 SHA512:
-  metadata.gz: d9000646169a24af31b427389e24d03f8bdaee492bf3ccc3f9dd12e975335711d1e0c468d99c78c0f83ac119bad5f3848fb24f36ef1268cfabbb7768d96c6414
-  data.tar.gz: ec817e13da4fc3cdf8e56f1ef252f45c794882c7e69c1fb9eef19b6f24ffe394084b793b13c553c5bdcf3086ab6de7ba8856b1080dc92702c9b11f8095923e0d
+  metadata.gz: 7bc73bc698ffc76b75ba3a92715728216dc53eeb34cfca95693234f86cd693f799f6cebe2fc9ab74926351e88513ee22f4efd5fcac49c4497388f0f87a67b4de
+  data.tar.gz: 6fa9ee4e078d7c9c82879adef1ef4956820e79f160ec12d0cd92e27190a77d0b3f4d0df08e81fbcc462919236f7047b99b0cc168ea9f8effddf06eebf655b3d6

data/bin/agency

@@ -19,11 +19,13 @@ module Smith
     AGENCY_NAME = 'agency'
 
     def initialize(opts={})
-
       @options = opts
       options_check
 
       @daemon = Daemon.new(add_vhost(AGENCY_NAME), opts[:daemon], opts[:pid_dir])
+
+      raise AgencyRunning, "The agency is alredy running." if  @daemon.running?
+
       @agency = Agency.new
 
       Smith.shutdown_hook do
@@ -40,29 +42,24 @@ module Smith
     end
 
     def run
-      if @daemon.running?
-        logger.fatal { "The agency is alredy running" }
-      else
-        logger.info { "Using config file: #{Smith.config_path}" }
-        require 'smith/messaging/acl_type_cache'
-
-        @daemon.daemonise
+      logger.info { "Using config file: #{Smith.config_path}" }
+      require 'smith/messaging/acl_type_cache'
 
-        Smith.compile_acls
+      @daemon.daemonise
 
-        Smith.start do
-          # 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.
+      Smith.compile_acls
+      Smith.start do
+        # 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.
 
-          Smith.shutdown_hook do
-            @daemon.unlink_pid_file
-          end
-
-          logger.info { "Starting #{File.basename($0)}" }
-          @agency.setup_queues
-          @agency.start_monitoring
+        Smith.shutdown_hook do
+          @daemon.unlink_pid_file
         end
+
+        logger.info { "Starting #{File.basename($0)}" }
+        @agency.setup_queues
+        @agency.start_monitoring
       end
     end
 
@@ -91,5 +88,9 @@ opts = Trollop::with_standard_exception_handling parser do
   parser.parse ARGV
 end
 
-agency_runner = Smith::AgencyRunner.new(opts)
-agency_runner.run
+begin
+  agency_runner = Smith::AgencyRunner.new(opts)
+  agency_runner.run
+rescue Smith::AgencyRunning => e
+  puts e.message
+end

data/lib/smith/exceptions.rb

@@ -6,6 +6,8 @@ module Smith
     end
   end
 
+  class AgencyRunning < RuntimeError; end
+
   module Messaging
     class MessageTimeoutError < RuntimeError; end
   end

data/lib/smith/messaging/requeue.rb

@@ -20,7 +20,7 @@ module Smith
         }
 
         @on_requeue_limit = opts[:on_requeue_limit] || ->(message, count, total_count, cumulative_delay) {
-          logger.info { "Requeue limit reached: #{total_count} for queue: #{@queue.name}, cummulative delay: #{cumulative_delay}s." }
+          logger.info { "Not attempting any more requeues, requeue limit reached: #{total_count} for queue: #{@queue.name}, cummulative delay: #{cumulative_delay}s." }
         }
       end
 
@@ -35,10 +35,10 @@ module Smith
             o[:type] = @metadata.type
           end
 
-          logger.verbose { "Requeuing to: #{@queue.name}. [options]: #{opts}" }
-          logger.verbose { "Requeuing to: #{@queue.name}. [message]: #{@message}" }
+          logger.verbose { "Requeuing to: #{@queue.name} [options]: #{opts}" }
+          logger.verbose { "Requeuing to: #{@queue.name} [message]: #{@message.to_hash}" }
 
-          @exchange.publish(ACL::Factory.create(@metadata.type, @message), opts)
+          @exchange.publish(@message, opts)
         end
       end
 

data/lib/smith/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smith
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Richard Heycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-20 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp