servitude 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bc5c02aa6f0759b2c023219955399164bc1fb7f
-  data.tar.gz: ed9b38cdedb0f0a593619abd71ae5e23ceb0a351
+  metadata.gz: dce6d48e55e0ea709cbac0ab8bb83576f5d4f855
+  data.tar.gz: c96667392283ea694bd05cdccbfe48a054a40416
 SHA512:
-  metadata.gz: 9aed8c3cfb27f402763f0cbb60291d4c8d3f46c4b8afe4ad76860812210071f60e8a74a25101925c5d8f2e8922e159b666703c2b695bc4237924f20d3caf7916
-  data.tar.gz: 0722743586090901fbe060ee76f26efe40540e89fd7795b10ea2459eb319eac8bbcc872a5deebbd611a6905ac5914501039e4ffd7784078d15cfe56ad69f90b8
+  metadata.gz: b79ae5973d8b1788a8ff27956081e746bc61bd91f53bab9bd5f509d04994950dd395883a0e87aa8c80b2ce256301805c65632000dfeaa859927d31e16a736a4a
+  data.tar.gz: f0946a59b22f543d219a45c3286ea3c93d6e26ae77080399c10faf137285b9ac231cb726200c64d71a4344fac8decc2fb6c83caeb07f0dd6c5c5a4e8b3c9b470

data/lib/servitude/server_threaded.rb

@@ -1,9 +1,12 @@
+require 'celluloid'
+
 module Servitude
   module ServerThreaded
 
     def self.included( base )
       base.class_eval do
         after_initialize :initialize_thread
+        after_initialize :initialize_celluloid_logger
       end
     end
 
@@ -17,21 +20,29 @@ module Servitude
       raise NotImplementedError
     end
 
-    def with_supervision( &block )
+    def with_supervision( options={}, &block )
       begin
         block.call
       rescue Servitude::SupervisionError
         # supervisor is restarting actor
         warn_for_supevision_error
-        sleep( config.supervision_retry_timeout || 0 )
+        notify_and_sleep_if_configured
         retry
       rescue Celluloid::DeadActorError
         # supervisor has yet to begin restarting actor
         warn_for_dead_actor_error
-        sleep( config.supervision_retry_timeout || 0 )
+        notify_and_sleep_if_configured
         retry
       rescue => e
-        handle_error( payload, delivery_info, e )
+        handle_error( options, e )
+      end
+    end
+
+    def notify_and_sleep_if_configured
+      if config.supervision_retry_timeout_in_seconds &&
+          config.supervision_retry_timeout_in_seconds > 0
+        debug "Sleeping for #{config.supervision_retry_timeout_in_seconds}s ..."
+        sleep( config.supervision_retry_timeout_in_seconds )
       end
     end
 
@@ -43,8 +54,13 @@ module Servitude
       warn "RETRYING due to Celluloid::DeadActorError ..."
     end
 
-    def handle_error( payload, delivery_info, e )
-      error( "#{e.class.name} | #{e.message} | #{e.backtrace.inspect}" )
+    def handle_error( options, e )
+      parts = [[e.class.name, e.message].join( ' ' ), format_backtrace( e.backtrace )]
+      error( parts.join( "\n" ))
+    end
+
+    def format_backtrace( backtrace )
+      "  #{backtrace.join "\n  "}"
     end
 
     # Correctly calls a single supervised actor when the threads configuraiton is set
@@ -69,6 +85,10 @@ module Servitude
       Celluloid::Actor[:handler]
     end
 
+    def initialize_celluloid_logger
+      Celluloid.logger = nil
+    end
+
     def initialize_thread
       return unless config.threads == 1
       handler_class.supervise_as :handler

data/lib/servitude/version.rb

@@ -1,3 +1,3 @@
 module Servitude
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servitude
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jason Harrelson