daemonic 0.0.2 → 0.1.0

data/lib/daemonic/producer.rb

@@ -0,0 +1,49 @@
+module Daemonic
+  class Producer
+
+    attr_reader :worker, :queue, :concurrency, :options
+
+    def initialize(worker, options)
+      @worker = worker
+      @options = options
+      @concurrency = options.fetch(:concurrency) { 4 }
+
+      @queue = SizedQueue.new(concurrency) { concurrency + 1 }
+      @running = true
+    end
+
+    def run
+      logger.info "Starting producer with #{concurrency} consumer threads."
+
+      Signal.trap("INT") { stop }
+      Signal.trap("TERM") { stop }
+
+      pool = Pool.new(concurrency, worker, logger)
+
+      producer = Thread.new do
+        while @running
+          worker.produce(pool)
+          Thread.pass
+        end
+        logger.info { "Producer has been shut down. Stopping the thread pool" }
+        pool.stop
+      end
+
+      producer.join
+
+      logger.info { "Shutting down" }
+
+    end
+
+    def stop
+      @running = false
+    end
+
+    def logger
+      @logger ||= Logger.new(@options[:log] || STDOUT).tap { |logger|
+        logger.level = @options[:log_level] || Logger::INFO
+      }
+    end
+
+  end
+end

data/lib/daemonic/version.rb

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

metadata

@@ -1,71 +1,109 @@
 --- !ruby/object:Gem::Specification
 name: daemonic
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - iain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Manages daemonizing your workers with basic monitoring and restart behavior.
+description: Daemonic makes multi-threaded daemons easy.
 email:
 - iain@iain.nl
-executables:
-- daemonic
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
-- LICENSE.txt
+- MIT-LICENSE.txt
 - README.md
 - Rakefile
-- bin/daemonic
 - daemonic.gemspec
+- examples/init-d.sh
+- examples/rss
+- features/support/env.rb
+- features/worker.feature
 - lib/daemonic.rb
 - lib/daemonic/cli.rb
-- lib/daemonic/configuration.rb
-- lib/daemonic/logging.rb
-- lib/daemonic/master.rb
-- lib/daemonic/pidfile.rb
+- lib/daemonic/daemon.rb
 - lib/daemonic/pool.rb
+- lib/daemonic/producer.rb
 - lib/daemonic/version.rb
-- lib/daemonic/worker.rb
-- test/config
-- test/crappy_daemon.rb
-- test/integration_test.rb
-- test/test_daemon.rb
 homepage: https://github.com/yourkarma/daemonic
 licenses:
 - MIT
@@ -76,22 +114,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Manages daemonizing your workers with basic monitoring and restart behavior.
+summary: Daemonic makes multi-threaded daemons easy.
 test_files:
-- test/config
-- test/crappy_daemon.rb
-- test/integration_test.rb
-- test/test_daemon.rb
+- features/support/env.rb
+- features/worker.feature
+has_rdoc: 

data/bin/daemonic

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-$LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
-
-require 'daemonic'
-options = Daemonic::CLI.parse(ARGV)
-Daemonic.start(options)

data/lib/daemonic/configuration.rb

@@ -1,110 +0,0 @@
-require 'logger'
-require 'shellwords'
-
-module Daemonic
-  class Configuration
-
-    Invalid = Class.new(ArgumentError)
-
-    attr_reader :eventual_config, :given_options
-
-    def initialize(given_options, pwd)
-      @given_options = given_options
-      @pwd = pwd
-      @eventual_config = {}
-    end
-
-    def command
-      self[:command]
-    end
-
-    def daemonize?
-      self[:daemonize]
-    end
-
-    def config_file
-      self[:config_file]
-    end
-
-    def workers
-      Integer(self[:workers] || "1")
-    end
-
-    def reload
-      @eventual_config = {}
-      @logger = nil
-      load_options defaults
-      load_options given_options
-      load_options config_file_options if config_file
-      load_options given_options
-      logger.debug { to_h.inspect }
-      validate
-    end
-
-    def working_dir
-      self[:working_dir]
-    end
-
-    def program_name
-      self[:program_name] || File.basename(working_dir)
-    end
-
-    def pidfile
-      self[:pidfile] || File.join(working_dir, "tmp/#{program_name}.pid")
-    end
-
-    def logfile
-      self[:logfile] || STDOUT
-    end
-
-    def logger
-      @logger ||= ::Logger.new(logfile).tap { |logger|
-        logger.formatter = proc { |severity, datetime, progname, msg|
-          "[#{severity}] [#{datetime}] [#{program_name}] [#{Process.pid}] #{msg}\n"
-        }
-        logger.level = ::Logger.const_get(loglevel)
-      }
-    end
-
-    def to_h
-      eventual_config
-    end
-
-    def loglevel
-      (self[:loglevel] || "INFO").to_s.upcase
-    end
-
-    protected
-
-    def [](key)
-      eventual_config[key.to_s]
-    end
-
-    def []=(key, value)
-      eventual_config[key.to_s] = value
-    end
-
-    private
-
-    def load_options(options)
-      options.each do |key, value|
-        self[key] = value
-      end
-    end
-
-    def config_file_options
-      contents = File.open(config_file, 'r:utf-8').read
-      args = Shellwords.split(contents)
-      CLI.parse(args)
-    end
-
-    def validate
-      raise Invalid, "No command specified" if command.nil?
-    end
-
-    def defaults
-      { :workers => 1, :working_dir => @pwd }
-    end
-
-  end
-end

data/lib/daemonic/logging.rb

@@ -1,14 +0,0 @@
-require 'forwardable'
-
-module Daemonic
-  module Logging
-    extend Forwardable
-
-    def_delegators :logger, :info, :debug, :warn, :fatal
-
-    def logger
-      config.logger
-    end
-
-  end
-end

data/lib/daemonic/master.rb

@@ -1,119 +0,0 @@
-require 'thread'
-require 'daemonic/version'
-require 'daemonic/logging'
-require 'daemonic/pidfile'
-
-Thread.abort_on_exception = true
-
-module Daemonic
-  class Master
-    include Logging
-
-    attr_reader :config, :pidfile
-
-    def initialize(config)
-      @config = config
-      @shutting_down = false
-      @current_status = nil
-      config.reload
-      update_program_name("booting")
-      @pidfile = Pidfile.new(
-        pid:       Process.pid,
-        config:    config,
-      )
-    end
-
-    def start
-      Dir.chdir(config.working_dir)
-      write_pidfile
-      at_exit { clean_pidfile }
-      trap_signals
-      start_workers
-      update_program_name(nil)
-      wait_until_done
-      update_program_name
-      fatal "Shutting down master"
-    end
-
-    def restart
-      @monitor = false
-      update_program_name("restarting")
-      pool.restart { update_program_name }
-      update_program_name(nil)
-      @monitor = true
-    end
-
-    def stop
-      @monitor = false
-      update_program_name("shutting down")
-      pool.stop { update_program_name }
-      @shutting_down = true
-    end
-
-    def hup
-      config.reload
-      pool.start
-      pool.hup
-    end
-
-    private
-
-    def write_pidfile
-      pidfile.write
-    end
-
-    def clean_pidfile
-      pidfile.clean
-    end
-
-    def start_workers
-      pool.start { update_program_name }
-      @monitor = true
-    end
-
-    def pool
-      @pool ||= Pool.new(config)
-    end
-
-    def trap_signals
-      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
-      pool.increase!
-    end
-
-    def ttou
-      pool.decrease!
-    end
-
-    def wait_until_done
-      while keep_running?
-        pool.monitor if @monitor
-        update_program_name
-        sleep 0.1
-      end
-    end
-
-    def keep_running?
-      not @shutting_down
-    end
-
-    def update_program_name(additional = :unchanged)
-      @current_status = additional if additional != :unchanged
-      base = "#{config.program_name} master [version #{VERSION}; #{pool.count}/#{pool.desired_workers} workers]"
-      if @current_status
-        $PROGRAM_NAME = "#{base} (#{@current_status})"
-      else
-        $PROGRAM_NAME = base
-      end
-      $PROGRAM_NAME
-    end
-
-  end
-end