daemonic 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08967f54a434d3f2a95afdff4d3012de7e4667f3
-  data.tar.gz: def0f290d179d0e77d20641773febe003faeefe8
+  metadata.gz: 9a49a7093feca6b333dc7da4ddfbb2dea81377ad
+  data.tar.gz: 8d3e900efb9ffae760202f7cb1172f3d9567c895
 SHA512:
-  metadata.gz: 8207b32bb5fb5775ce32c3e13beca35c959da25fd3c9ffbb212e43e5ab902303c53ff62c126fe5dc3c9a9f2d1bb596fa451710f7e9fd3f7eff2f7c4a34d689bf
-  data.tar.gz: ccdc7553329447f58460b573c29e585b044acf334ba79a0df553bd05bd9e908c7cd8d877dd660798fcca15bba6de417ce5d54c9190782f04dea06f9fc35f67bc
+  metadata.gz: 04b108265d68f1f49659cf82fcdbc80a625f72ceb6973e41ad69c4ebd6434bb8fb22101f0e82229079733b848caa32d107699ff3e97449f81eb975976ab4671b
+  data.tar.gz: 54e5d8e69419aa4748d4a7dcb0ad36731cbd03e270148efe3a51124bd6417cc6fe87808229d51feba23f8ebf8f09ec7035f51bfda2a50e06cc261b457f84997f

data/features/worker.feature

@@ -25,13 +25,13 @@ Feature: Worker
       Daemonic.run { MyWorker.new }
       """
 
-    When I run `./worker start --daemonize --pid tmp/worker.pid`
+    When I run `./worker start --daemonize --pid tmp/worker.pid --log test.log`
     Then the exit status should be 0
 
     When I run `./worker status --pid tmp/worker.pid`
     Then the exit status should be 0
 
-    When I run `./worker restart --pid tmp/worker.pid`
+    When I run `./worker restart --pid tmp/worker.pid --log test.log`
     Then the exit status should be 0
 
     When I run `./worker stop --pid tmp/worker.pid`

data/lib/daemonic/daemon.rb

@@ -88,7 +88,7 @@ module Daemonic
     end
 
     def cleanup_pid_file
-      File.unlink(pid_file) if pid_file
+      File.unlink(pid_file) if pid_file && File.exist?(pid_file)
     end
 
     def write_pid_file

data/lib/daemonic/producer.rb

@@ -13,8 +13,21 @@ module Daemonic
     end
 
     def run
+
       logger.info "Starting producer with #{concurrency} consumer threads."
 
+      at_exit {
+        last_error = $!
+        if last_error
+          msg = "Shutting down: #{last_error.inspect}\n#{last_error.backtrace.join("\n")}"
+          logger.fatal msg
+          $stdout.puts msg
+        else
+          logger.fatal "Shutting down"
+          $stdout.puts "Shutting down"
+        end
+      }
+
       Signal.trap("INT") { stop }
       Signal.trap("TERM") { stop }
 
@@ -31,8 +44,6 @@ module Daemonic
 
       producer.join
 
-      logger.info { "Shutting down" }
-
     end
 
     def stop
@@ -40,8 +51,10 @@ module Daemonic
     end
 
     def logger
-      @logger ||= Logger.new(@options[:log] || STDOUT).tap { |logger|
-        logger.level = @options[:log_level] || Logger::INFO
+      @logger ||= @options.fetch(:logger) {
+        Logger.new(@options[:log] || STDOUT).tap { |logger|
+          logger.level = @options[:log_level] || Logger::INFO
+        }
       }
     end
 

data/lib/daemonic/version.rb

@@ -1,3 +1,3 @@
 module Daemonic
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daemonic
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - iain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler