Safely optional

Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: .
   specs:
-    daemon-kit (0.3.0.rc1)
+    daemon-kit (0.3.0.rc2)
       eventmachine (>= 0.12.10)
       i18n
-      safely (>= 0.3.1)
       thor
 
 GEM
@@ -59,3 +58,4 @@ DEPENDENCIES
   rake
   rdoc
   rspec (~> 2.6)
+  safely (~> 0.3.2)

daemon-kit.gemspec

@@ -42,9 +42,9 @@ $ daemon-kit -h
   gem.add_development_dependency(%q<cucumber>, ["~> 1.3.8"])
   gem.add_development_dependency(%q<aruba>, ["~> 0.5.3"])
   gem.add_development_dependency(%q<SyslogLogger>)
+  gem.add_development_dependency(%q<safely>, ["~> 0.3.2"])
 
   gem.add_dependency(%q<thor>)
   gem.add_runtime_dependency(%q<eventmachine>, [">= 0.12.10"])
-  gem.add_runtime_dependency(%q<safely>, [">= 0.3.1"])
   gem.add_runtime_dependency(%q<i18n>)
 end

lib/daemon_kit/initializer.rb

@@ -8,8 +8,6 @@
   $LOAD_PATH.include?( File.expand_path('../', __FILE__).to_absolute_path )
 
 require 'daemon_kit'
-require 'safely'
-
 module DaemonKit
 
   class << self
@@ -206,10 +204,17 @@ def include_core_lib
     def configure_safely
       Thread.abort_on_exception = true
 
-      Safely::Strategy::Log.logger = DaemonKit.logger
+      if defined? Safely
+        DaemonKit.logger.info "Configuring safely for exception handling"
+        Safely::Strategy::Log.logger = DaemonKit.logger
+
+        Safely::Backtrace.trace_directory = File.join( DAEMON_ROOT, "log" )
+        Safely::Backtrace.enable!
 
-      Safely::Backtrace.trace_directory = File.join( DAEMON_ROOT, "log" )
-      Safely::Backtrace.enable!
+      else
+        DaemonKit.logger.info "Safely not available, remember to implement good exception handling"
+
+      end
     end
 
     def set_process_name

lib/daemon_kit/ruote_participants.rb

@@ -105,7 +105,8 @@ def run_amqp!
 
           cmdq = mq.queue( q, :durable => true )
           cmdq.subscribe( :ack => true ) do |header, message|
-            safely do
+
+            receiver = lambda do |header, message|
               DaemonKit.logger.debug("Received workitem: #{message.inspect}")
 
               RuoteWorkitem.process( :amqp, @amqp_reply_queue, message )
@@ -114,6 +115,15 @@ def run_amqp!
 
               header.ack
             end
+
+            if defined? Safely
+              safely { receiver.call( header, message ) }
+
+            else
+              receiver.call( header, message )
+
+            end
+
           end
         end
       end

lib/daemon_kit/version.rb

@@ -1,6 +1,8 @@
 module DaemonKit
+
   def version
-    '0.3.0.rc1'
+    '0.3.0.rc2'
   end
+
   module_function :version
 end

lib/generators/daemon_kit/app/templates/Gemfile

@@ -11,7 +11,11 @@ source 'https://rubygems.org'
 # daemon-kit
 gem 'daemon-kit'
 
+#
 # safely (http://github.com/kennethkalmer/safely)
-gem 'safely'
+#
+
+gem 'safely' # Optional, but recommended.
+
 # gem 'toadhopper' # For reporting exceptions to hoptoad
 # gem 'mail' # For reporting exceptions via mail