daemonic 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c90af55fdad70a6c4a99fc782c9fa34fb7ed6939
+  data.tar.gz: 08b9b435ce0d8e4c5b87978b66f804a55b388dab
+SHA512:
+  metadata.gz: d6a23fc8d43c33e1346dce80900130ea7c703d80b05e6028cbb8cb7d0c8c44315f3aad50d1a20f17bcc849412b77376db282582e6b9a2fb16c4d38cfdf1fc444
+  data.tar.gz: e38c14642dc4d6c5b618610b62bfd30e3b315571dff5cf2cbf36ff7e040be1b3735522c85c6e8f841c20ca0986485ddc4a90ebd6a043d69592d93a6654120f74

data/README.md

@@ -87,6 +87,33 @@ These are the signals daemonic responds to:
 * `TTIN` increase the number of workers by one
 * `TTOU` decrease the number of workers by one
 
+### Creating a worker
+
+Here's an example of a basic daemonic worker:
+
+``` ruby
+exiting = false
+
+trap("TERM") { exiting = true }
+trap("INT") { exiting = true }
+trap("HUP") {
+  # reload settings
+}
+
+puts "Booting worker number #{ENV["DAEMON_WORKER_NUMBER"]}"
+
+SomePollingService.poll do
+  # do your work here
+  break if exiting
+end
+
+puts "Shutting down worker number #{ENV["DAEMON_WORKER_NUMBER"]}"
+```
+
+Most importantly:
+
+* Trap INT and TERM signals to cleanly stop your process
+
 ## Contributing
 
 1. Fork it

data/bin/daemonic

@@ -2,13 +2,5 @@
 $LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
 
 require 'daemonic'
-
-config = Daemonic.configuration(ARGV, Dir.pwd)
-
-config.reload
-
-if config.daemonize?
-  Process.daemon
-end
-
-Daemonic.spawn(config)
+options = Daemonic::CLI.parse(ARGV)
+Daemonic.start(options)

data/lib/daemonic/configuration.rb

@@ -6,10 +6,10 @@ module Daemonic
 
     Invalid = Class.new(ArgumentError)
 
-    attr_reader :eventual_config, :args
+    attr_reader :eventual_config, :given_options
 
-    def initialize(args, pwd)
-      @args = args
+    def initialize(given_options, pwd)
+      @given_options = given_options
       @pwd = pwd
       @eventual_config = {}
     end
@@ -34,9 +34,9 @@ module Daemonic
       @eventual_config = {}
       @logger = nil
       load_options defaults
-      load_options command_line_options
+      load_options given_options
       load_options config_file_options if config_file
-      load_options command_line_options
+      load_options given_options
       logger.debug { to_h.inspect }
       validate
     end
@@ -92,10 +92,6 @@ module Daemonic
       end
     end
 
-    def command_line_options
-      CLI.parse(args)
-    end
-
     def config_file_options
       contents = File.open(config_file, 'r:utf-8').read
       args = Shellwords.split(contents)

data/lib/daemonic/master.rb

@@ -76,12 +76,12 @@ module Daemonic
     end
 
     def trap_signals
-      trap("USR2") { info "USR2 received!"; restart }
-      trap("TERM") { info "TERM received!"; stop }
-      trap("INT")  { info "INT received!";  stop }
-      trap("HUP")  { info "HUP received!";  hup }
-      trap("TTIN") { info "TTIN received!"; ttin }
-      trap("TTOU") { info "TTOU received!"; ttou }
+      trap("USR2") { Thread.new { info "USR2 received!"; restart } }
+      trap("TERM") { Thread.new { info "TERM received!"; stop } }
+      trap("INT")  { Thread.new { info "INT received!";  stop } }
+      trap("HUP")  { Thread.new { info "HUP received!";  hup } }
+      trap("TTIN") { Thread.new { info "TTIN received!"; ttin } }
+      trap("TTOU") { Thread.new { info "TTOU received!"; ttou } }
     end
 
     def ttin

data/lib/daemonic/version.rb

@@ -1,3 +1,3 @@
 module Daemonic
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/daemonic.rb

@@ -6,12 +6,12 @@ require "daemonic/cli"
 
 module Daemonic
 
-  def self.spawn(*args)
-    Master.new(*args).start
+  def self.start(options)
+    config = Configuration.new(options, Dir.pwd)
+    config.reload
+    Process.daemon if config.daemonize?
+    Master.new(config).start
   end
 
-  def self.configuration(*args)
-    Configuration.new(*args)
-  end
 
 end

data/test/integration_test.rb

@@ -19,6 +19,23 @@ class TestIntegration < MiniTest::Unit::TestCase
     wait_for(10) { not running? master_pid }
   end
 
+  def test_start_daemonic_programmatically
+    $LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
+    require 'daemonic'
+    Thread.new {
+      Daemonic.start(
+        name: "daemon-test",
+        workers: 5,
+        command: "ruby test/test_daemon.rb",
+        logfile: LOGFILE,
+        pidfile: "tmp/test.pid",
+      )
+    }
+    sleep 0.2
+    master_pid = Integer(File.open("tmp/test.pid").read)
+    perform_tests(master_pid)
+  end
+
   def setup
     FileUtils.mkdir_p(File.dirname(LOGFILE))
     FileUtils.rm(LOGFILE) if File.exist?(LOGFILE)

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: daemonic
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - iain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,17 +27,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Manages daemonizing your workers with basic monitoring and restart behavior.
@@ -74,27 +69,26 @@ files:
 homepage: https://github.com/yourkarma/daemonic
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Manages daemonizing your workers with basic monitoring and restart behavior.
 test_files:
 - test/config