trident 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDRhNzEyMDc3ZGY3NGM3MDAzMzNkNWJmYTM5ODUxOTA4OTljN2YyMg==
-  data.tar.gz: !binary |-
-    MjQ2YWVmMzAwZjEzNTUwZTkwNzJlOGU3YzNhMjc4ZTNlNTU2ZTdhYw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZTc0NGI3MjljOTg4YzI1MDhkMDg0YWVjNTUxY2ZiYjkxN2YyMDkyMGRhYzZm
-    MDRjMmQ4MDA0MmRjMGVjNmM2NWI1OTMwNDUyYTU2ZWE1YjI2MjA3YjZkN2Zm
-    NzY3NWZkZWJiYTBiODM5Njk4MDU1MWZmMGVjOTc3OTk0YmRhZDI=
-  data.tar.gz: !binary |-
-    NTljZGRhZDc2NDBkYmVjYjkzZGM2OTM0M2Q0NmYzYWNlZjc3MmYxNzFkM2Uy
-    YWNkMWIxMzM4MzhkOTBmODVjNjkyMzliOWMyYTUyOTFmMTk3OWJlZTQ0Mjgy
-    NjllMmJlZjkyN2U3NWM4NzlhNjNhZDhjOGVjODZiZjY5ZDMyNDk=
+SHA1:
+  metadata.gz: c1497896041247b078fad1afd3814676a75819c7
+  data.tar.gz: 7fc6cc36f0a02b4088270ed5466e67d2f33b8bdd
+SHA512:
+  metadata.gz: c462d1e488d09b3779dee1c44a378aaf65ea41f8b283fe98fcf091d1e351dd6a8150ff11e61bf26396f110de13b718d39db3d31c4da1eb0b584daf5201172fb6
+  data.tar.gz: a2686b40f96950edc600388daa311487c08f932666524b4c050b2bd9cfd70ae5ed6baa0f3217b26fd8c15d82e262343aa7d78c6ef60f9dfafdf562d0157ba659

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - jruby-19mode
-  - rbx-19mode
+#  - rbx-19mode
   
 script: bundle exec rake

data/CHANGELOG

@@ -0,0 +1,10 @@
+0.2.0 (11/18/2013)
+------------------
+
+prevent environment from stealing cli log <0947a63> [Matt Conway]
+
+
+0.1.0 (11/05/2013)
+------------------
+
+Initial version

data/README.md

@@ -1,5 +1,8 @@
 # Trident
 
+[![Build Status](https://secure.travis-ci.org/wr0ngway/trident.png)](http://travis-ci.org/wr0ngway/trident)
+[![Coverage Status](https://coveralls.io/repos/wr0ngway/trident/badge.png?branch=master)](https://coveralls.io/r/wr0ngway/trident?branch=master)
+
 A ruby gem for managing pools of forked workers
 
 ## Installation
@@ -25,9 +28,11 @@ After installing the gem, use the 'trident' binary to generate an example config
 Edit the file with your desired setup, then run trident to launch all your worker pools
 
 See other command line options with
+
     trident --help
 
 
 ## TODO
 
 * Add support for reloading the trident config with a HUP signal
+* Add support in yml for specifying [process limits](http://www.ruby-doc.org/core-1.9.3/Process.html#method-c-setrlimit) (memory especially)

data/bin/trident

@@ -3,6 +3,13 @@
 
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
+# setup gemlogger before loading our classes so they use
+# our logger, and it doesn't get overridden by a preloaded
+# client environment
+require 'gem_logger'
+require 'trident/cli_logger'
+GemLogger.logger_concern = Trident::CLILogger
+
 require 'trident'
 Trident::CLI.run
 

data/lib/trident/cli.rb

@@ -1,6 +1,7 @@
 require 'clamp'
 require 'erb'
 require 'yaml'
+require 'trident/cli_logger'
 
 module Trident
   class CLI < Clamp::Command
@@ -44,8 +45,8 @@ module Trident
       self.pidfile = expand_path(pidfile)
       self.config = expand_path(config)
 
-      GemLogger.default_logger = Logger.new(logfile ? logfile : STDOUT)
-      GemLogger.default_logger.level = verbose? ? Logger::DEBUG : Logger::INFO
+      Trident::CLILogger.trident_logger = Logger.new(logfile ? logfile : STDOUT)
+      Trident::CLILogger.trident_logger.level = verbose? ? Logger::DEBUG : Logger::INFO
       $stdout.sync = $stderr.sync = true
 
       if daemon? && (logfile.nil? || pidfile.nil?)
@@ -89,7 +90,9 @@ module Trident
 
     # Configure through yaml file
     def load_config(path_to_yaml_file)
-      config = YAML::load(ERB.new(IO.read(path_to_yaml_file)).result)
+      erb = ERB.new(IO.read(path_to_yaml_file))
+      erb.filename = path_to_yaml_file
+      config = YAML::load(erb.result)
       config = config[Rails.env.to_s] if defined?(::Rails) && config.has_key?(Rails.env.to_s)
       config
     end

data/lib/trident/cli_logger.rb

@@ -0,0 +1,23 @@
+# setup our own logger for cli so that we don't lose it when
+# we preload environment for workers
+module Trident
+  module CLILogger
+
+    extend ActiveSupport::Concern
+
+    def self.trident_logger
+      @trident_logger ||= ::Logger.new(STDOUT)
+    end
+
+    def self.trident_logger=(logger)
+      @trident_logger = logger
+    end
+
+    module ClassMethods
+      def logger
+        Trident::CLILogger.trident_logger
+      end
+    end
+
+  end
+end

data/lib/trident/signal_handler.rb

@@ -50,8 +50,9 @@ module Trident
       loop do
         signal_result = handle_signal_queue
         break if signal_result == :break
+        logger.debug "Snoozing main loop"
         msg = snooze if signal_queue.empty?
-        logger.debug "Main loop awake"
+        logger.debug "Main loop awakened: #{msg.inspect}"
         break if msg == MSG_STOP
       end
       logger.info "Main loop exited"
@@ -81,7 +82,6 @@ module Trident
     def snooze
       msg = ""
       begin
-        logger.info "Snoozing main loop"
         ready = IO.select([self_pipe.first], nil, nil, 1) or return
         ready.first && ready.first.first or return
         loop { msg << self_pipe.first.read_nonblock(CHUNK_SIZE) }

data/lib/trident/version.rb

@@ -1,3 +1,3 @@
 module Trident
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/test/fixtures/trident_logging.yml

@@ -0,0 +1,44 @@
+# a name for labelling pool processes
+application: app_name
+
+# loads handlers in the master process before forking workers
+prefork: true
+
+# Configure the behavior of the pool manager in response to signals
+# actions are methods on PoolManager and can be sequenced
+signals:
+  INT: stop_gracefully
+  TERM: stop_forcefully
+  USR1: [stop_forcefully, wait]
+
+# define and setup all the PoolHandlers
+handlers:
+  myhandler:
+    environment: |+
+      require 'gem_logger'
+      GemLogger.default_logger = Logger.new("/dev/null")
+      class MyWorker
+        def initialize(o)
+          @o = o
+        end
+        def start
+          loop { sleep 1 }
+        end
+      end
+    class: MyWorker
+    options:
+    signals:
+      default: USR2
+      stop_gracefully: INT
+      stop_forcefully: TERM
+
+# Configure the worker pools
+pools:
+  mypool1:
+    # number of worker processes
+    size: 2
+    # chooses a handler defined above for running process
+    handler: myhandler
+    # options passed to each handler's initializer (merged into handler options above)
+    options:
+      name: one

data/test/integration/trident_test.rb

@@ -7,28 +7,6 @@ class Trident::TridentTest < MiniTest::Should::TestCase
     @cli = "#{File.expand_path('../../..', __FILE__)}/bin/trident"
   end
 
-  def wait_for(io, pattern)
-    timeout(5) do
-      loop do
-        line = io.readline
-        puts line if ENV['DEBUG']
-        break if line =~ pattern
-      end
-    end
-  end
-
-  def process_list
-    processes = {}
-    lines = `ps -e -opid,command`.lines.grep(/trident\[/)
-    lines.each do |line|
-      pieces = line.split
-      pid = pieces[0].to_i
-      next if pid == Process.pid
-      command = pieces[1..-1].join(' ')
-      processes[pid] = command
-    end
-    processes
-  end
 
   def parse_manager(manager_str)
     pools = {}
@@ -48,7 +26,7 @@ class Trident::TridentTest < MiniTest::Should::TestCase
       wait_for(io, /<pool-mypool1> Pool started with 3 workers/)
       wait_for(io, /<pool-mypool2> Pool started with 2 workers/)
 
-      processes = process_list
+      processes = child_processes
       assert_equal 6, processes.size
       manager = processes[io.pid]
       pools = parse_manager(manager)
@@ -66,7 +44,7 @@ class Trident::TridentTest < MiniTest::Should::TestCase
       wait_for(io, /Main loop exited/)
 
       Process.wait(io.pid)
-      assert_empty process_list
+      assert_empty child_processes
     end
 
   end
@@ -80,7 +58,7 @@ class Trident::TridentTest < MiniTest::Should::TestCase
       wait_for(io, /<pool-mypool1> Pool started with 3 workers/)
       wait_for(io, /<pool-mypool2> Pool started with 2 workers/)
 
-      processes = process_list
+      processes = child_processes
       assert_equal 6, processes.size
       manager = processes[io.pid]
       pools = parse_manager(manager)
@@ -89,7 +67,7 @@ class Trident::TridentTest < MiniTest::Should::TestCase
       Process.kill("KILL", child)
 
       wait_for(io, /<pool-mypool1> Spawned worker \d+, worker count now at 3/)
-      processes = process_list
+      processes = child_processes
       assert_equal 6, processes.size
       manager = processes[io.pid]
       pools = parse_manager(manager)
@@ -98,7 +76,7 @@ class Trident::TridentTest < MiniTest::Should::TestCase
 
       Process.kill("USR1", io.pid)
       Process.wait(io.pid)
-      assert_empty process_list
+      assert_empty child_processes
     end
 
   end

data/test/test_helper.rb

@@ -1,9 +1,9 @@
 require 'rubygems'
 
-if ENV['CI']
-  require 'coveralls'
-  Coveralls.wear!
-end
+#if ENV['CI']
+#  require 'coveralls'
+#  Coveralls.wear!
+#end
 
 require 'bundler'
 begin
@@ -93,11 +93,46 @@ class FileCounter
 
 end
 
+def wait_for(io, pattern)
+  timeout(5) do
+    loop do
+      line = io.readline
+      puts line if ENV['DEBUG']
+      break if line =~ pattern
+    end
+  end
+end
+
+def child_processes(pid=Process.pid)
+  processes = {}
+  lines = `pstree -w #{pid}`.lines.to_a
+  #  lines = `ps -g #{pid} -opid,command`.lines.to_a
+  lines.shift # get rid of header
+  lines.each do |line|
+    pieces = line.scan(/\A[^\d]*(\d+) \w+ (.*)\Z/).first
+    pid = pieces.shift
+    pid = pid.to_i
+    raise "Failed to extract pid: #{line} - #{pieces}" if pid == 0
+    next if pid == Process.pid
+
+    command = pieces.shift.strip
+    next if command =~ /^ps/
+    processes[pid] = command
+  end
+  processes
+end
+
+def kill_all_child_processes
+  child_processes.keys.each {|p| Process.kill("KILL", p) rescue nil }
+  Process.waitall
+end
+
 class MiniTest::Should::TestCase
   ORIGINAL_PROCLINE = $0
 
   setup do
     $0 = ORIGINAL_PROCLINE
+    kill_all_child_processes
   end
 end
 

data/test/unit/trident/cli_test.rb

@@ -24,6 +24,20 @@ class Trident::CLITest < MiniTest::Should::TestCase
 
   end
 
+  context "#logging" do
+
+    should "keep own logger when preforking" do
+      # Make sure cli keeps log when preforked environment replaces GemLogger.basic_logger
+      cmd = "#{@cli} --config #{@project_root}/test/fixtures/trident_logging.yml"
+      io = IO.popen(cmd, :err=>[:child, :out])
+      wait_for(io, /<pool-mypool1> Pool started with 2 workers/)
+
+      Process.kill("TERM", io.pid)
+      Process.wait(io.pid)
+    end
+
+  end
+
   context "#project_root" do
 
     should "use bundler env for root" do

data/test/unit/trident/utils_test.rb

@@ -8,11 +8,12 @@ class Trident::UtilsTest < MiniTest::Should::TestCase
     should "set the procline of the process" do
       pid = fork do
         procline "foo", "bar"
+        sleep 1
       end
-
-      process_name = `ps -o command -p #{pid}`.lines.to_a.last.strip
+      process_name = child_processes[pid]
       assert_equal "trident[foo]: bar", process_name
       Process.kill("KILL", pid)
+      Process.waitall
     end
     
   end

metadata

@@ -1,52 +1,52 @@
 --- !ruby/object:Gem::Specification
 name: trident
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Matt Conway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_logger
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: clamp
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
@@ -54,58 +54,58 @@ dependencies:
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
   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: minitest
-  prerelease: false
   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: minitest_should
-  prerelease: false
   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: minitest-reporters
-  prerelease: false
   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 pools of forked ruby processes
@@ -119,6 +119,7 @@ files:
 - .coveralls.yml
 - .gitignore
 - .travis.yml
+- CHANGELOG
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -126,6 +127,7 @@ files:
 - bin/trident
 - lib/trident.rb
 - lib/trident/cli.rb
+- lib/trident/cli_logger.rb
 - lib/trident/pool.rb
 - lib/trident/pool_handler.rb
 - lib/trident/pool_manager.rb
@@ -133,6 +135,7 @@ files:
 - lib/trident/utils.rb
 - lib/trident/version.rb
 - test/fixtures/integration_project/config/trident.yml
+- test/fixtures/trident_logging.yml
 - test/integration/trident_test.rb
 - test/test_helper.rb
 - test/unit/trident/cli_test.rb
@@ -153,22 +156,23 @@ 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.0.7
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Manages pools of forked ruby processes
 test_files:
 - test/fixtures/integration_project/config/trident.yml
+- test/fixtures/trident_logging.yml
 - test/integration/trident_test.rb
 - test/test_helper.rb
 - test/unit/trident/cli_test.rb