servolux 0.8.1 → 0.9.0

data/lib/servolux.rb

@@ -2,7 +2,7 @@
 module Servolux
 
   # :stopdoc:
-  VERSION = '0.8.1'
+  VERSION = '0.9.0'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
@@ -12,6 +12,8 @@ module Servolux
 
   # Returns the version string for the library.
   #
+  # @return [String]
+  #
   def self.version
     VERSION
   end
@@ -20,25 +22,31 @@ module Servolux
   # they will be joined to the end of the libray path using
   # <tt>File.join</tt>.
   #
+  # @return [String] absolute servolux 'lib' path
+  #
   def self.libpath( *args )
     args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
   end
 
   # Returns the lpath for the module. If any arguments are given,
-  # they will be joined to the end of the path using
+  # they will be joined to the end of the servolux base path using
   # <tt>File.join</tt>.
   #
+  # @return [String] absolute servolux base path
+  #
   def self.path( *args )
     args.empty? ? PATH : ::File.join(PATH, args.flatten)
   end
 
   # Returns +true+ if the execution platform supports fork.
   #
+  # @return [Boolean]
+  #
   def self.fork?
     RUBY_PLATFORM != 'java' and test(?e, '/dev/null')
   end
 
-end  # module Servolux
+end
 
 %w[threaded server piper daemon child prefork].each do |lib|
   require Servolux.libpath('servolux', lib)

data/spec/piper_spec.rb

@@ -102,7 +102,7 @@ describe Servolux::Piper do
     }
 
     @piper.parent {
-      @piper.gets.should == 1
+      @piper.gets.should_not == Process.pid
     }
   end
 

data/spec/prefork_spec.rb

@@ -0,0 +1,125 @@
+
+require File.join(File.dirname(__FILE__), %w[spec_helper])
+require 'tempfile'
+require 'fileutils'
+require 'enumerator'
+
+if Servolux.fork?
+
+describe Servolux::Prefork do
+
+  def pids
+    workers.map! { |w| w.instance_variable_get(:@piper).pid }
+  end
+
+  def workers
+    ary = []
+    return ary if @prefork.nil?
+    @prefork.each_worker { |w| ary << w }
+    ary
+  end
+
+  def worker_count
+    Dir.glob(@glob).length
+  end
+
+  def alive?( pid )
+    Process.kill(0, pid)
+    true
+  rescue Errno::ESRCH, Errno::ENOENT
+    false
+  end
+
+  before :all do
+    tmp = Tempfile.new 'servolux-prefork'
+    @path = path = tmp.path; tmp.unlink
+    @glob = @path + '/*.txt'
+    FileUtils.mkdir @path
+
+    @worker = Module.new {
+      define_method(:before_executing) { @fd = File.open(path + "/#$$.txt", 'w') }
+      def after_executing() @fd.close; FileUtils.rm_f @fd.path; end
+      def execute() @fd.puts Time.now; sleep 2; end
+      def hup() @thread.wakeup; end
+      alias :term :hup
+    }
+  end
+
+  after :all do
+    FileUtils.rm_rf @path
+  end
+
+  before :each do
+    @prefork = nil
+    FileUtils.rm_f "#@path/*.txt"
+  end
+
+  after :each do
+    next if @prefork.nil?
+    @prefork.stop
+    @prefork.each_worker { |worker| worker.signal('KILL') }
+    @prefork = nil
+    FileUtils.rm_f "#@path/*.txt"
+  end
+
+  it "starts up a single worker" do
+    @prefork = Servolux::Prefork.new :module => @worker
+    @prefork.start 1
+    ary = workers
+    sleep 0.1 until ary.all? { |w| w.alive? }
+    sleep 0.1 until worker_count >= 1
+
+    ary = Dir.glob(@glob)
+    ary.length.should == 1
+    File.basename(ary.first).to_i.should == pids.first
+  end
+
+  it "starts up a number of workers" do
+    @prefork = Servolux::Prefork.new :module => @worker
+    @prefork.start 8
+    ary = workers
+    sleep 0.250 until ary.all? { |w| w.alive? }
+    sleep 0.250 until worker_count >= 8
+
+    ary = Dir.glob(@glob)
+    ary.length.should == 8
+
+    ary.map! { |fn| File.basename(fn).to_i }.sort!
+    ary.should == pids.sort
+  end
+
+  it "stops workers gracefullly" do
+    @prefork = Servolux::Prefork.new :module => @worker
+    @prefork.start 3
+    ary = workers
+    sleep 0.250 until ary.all? { |w| w.alive? }
+    sleep 0.250 until worker_count >= 3
+
+    ary = Dir.glob(@glob)
+    ary.length.should == 3
+
+    @prefork.stop
+    sleep 0.250 until Dir.glob(@glob).length == 0
+
+    rv = workers.all? { |w| !w.alive? }
+    rv.should == true
+  end
+
+  it "restarts a worker via SIGHUP" do
+    @prefork = Servolux::Prefork.new :module => @worker
+    @prefork.start 2
+    ary = workers
+    sleep 0.250 until ary.all? { |w| w.alive? }
+    sleep 0.250 until worker_count >= 2
+
+    pid = pids.last
+    ary.last.signal 'HUP'
+    @prefork.reap until !alive? pid
+    sleep 0.250 until ary.all? { |w| w.alive? }
+
+    pid.should_not == pids.last
+  end
+
+end
+end  # Servolux.fork?
+

data/spec/server_spec.rb

@@ -15,6 +15,7 @@ describe Servolux::Server do
   end
 
   after :each do
+    @server.shutdown
     File.delete @server.pid_file if test(?f, @server.pid_file)
   end
 
@@ -22,7 +23,7 @@ describe Servolux::Server do
     test(?e, @server.pid_file).should be_false
 
     t = Thread.new {@server.startup}
-    Thread.pass until @server.status == 'sleep'
+    Thread.pass until @server.running? and t.status == 'sleep'
     test(?e, @server.pid_file).should be_true
 
     @server.shutdown
@@ -32,20 +33,26 @@ describe Servolux::Server do
 
   it 'generates a PID file with mode rw-r----- by default' do
     t = Thread.new {@server.startup}
-    Thread.pass until @server.status == 'sleep'
+    Thread.pass until @server.running? and t.status == 'sleep'
+
+    @log_output.readline.chomp.should == %q(DEBUG  Servolux : Server "Test Server" creating pid file "test_server.pid")
+    @log_output.readline.chomp.should == %q(DEBUG  Servolux : Starting)
     (File.stat(@server.pid_file).mode & 0777).should == 0640
   end
 
   it 'generates PID file with the specified permissions' do
     @server.pid_file_mode = 0400
     t = Thread.new {@server.startup}
-    Thread.pass until @server.status == 'sleep'
+    Thread.pass until @server.running? and t.status == 'sleep'
+
+    @log_output.readline.chomp.should == %q(DEBUG  Servolux : Server "Test Server" creating pid file "test_server.pid")
+    @log_output.readline.chomp.should == %q(DEBUG  Servolux : Starting)
     (File.stat(@server.pid_file).mode & 0777).should == 0400
   end
 
   it 'shuts down gracefully when signaled' do
     t = Thread.new {@server.startup}
-    Thread.pass until @server.status == 'sleep'
+    Thread.pass until @server.running? and t.status == 'sleep'
     @server.running?.should be_true
 
     Process.kill('INT', $$)
@@ -61,7 +68,7 @@ describe Servolux::Server do
     end
 
     t = Thread.new {@server.startup}
-    Thread.pass until @server.status == 'sleep'
+    Thread.pass until @server.running? and t.status == 'sleep'
     @log_output.readline
 
     Process.kill('USR1', $$)

data/spec/threaded_spec.rb

@@ -7,10 +7,23 @@ describe Servolux::Threaded do
     include Servolux::Threaded
     def initialize
       self.interval = 0
+      @mutex = Mutex.new
+      @signal = ConditionVariable.new
     end
     def pass( val = 'sleep' )
       Thread.pass until status == val
     end
+    def send_signal
+      @mutex.synchronize {
+        @signal.signal
+        @signal = nil
+      }
+    end
+    def wait_signal
+      @mutex.synchronize {
+        @signal.wait(@mutex) unless @signal.nil?
+      }
+    end
   end
 
   it "let's you know that it is running" do
@@ -93,7 +106,9 @@ describe Servolux::Threaded do
     klass = Class.new(base) do
       def run()
         @sleep ||= false
-        if @sleep then sleep
+        if @sleep
+          send_signal
+          sleep
         else
           @sleep = true
           raise 'ni'
@@ -105,7 +120,7 @@ describe Servolux::Threaded do
     obj.continue_on_error = true
 
     obj.start
-    obj.pass
+    obj.wait_signal
 
     obj.running?.should be_true
     @log_output.readline

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: servolux
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-12 00:00:00 -07:00
+date: 2009-11-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.0
+        version: 1.2.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: bones-git
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 1.1.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: logging
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.8
+        version: 1.2.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: bones
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.1
+        version: 3.1.0
     version: 
 description: |-
   Serv-O-Lux is a collection of Ruby classes that are useful for daemon and
@@ -79,10 +79,9 @@ files:
 - History.txt
 - README.rdoc
 - Rakefile
-- a.rb
-- b.rb
 - examples/beanstalk.rb
 - examples/echo.rb
+- examples/server_beanstalk.rb
 - lib/servolux.rb
 - lib/servolux/child.rb
 - lib/servolux/daemon.rb
@@ -92,6 +91,7 @@ files:
 - lib/servolux/threaded.rb
 - spec/child_spec.rb
 - spec/piper_spec.rb
+- spec/prefork_spec.rb
 - spec/server_spec.rb
 - spec/servolux_spec.rb
 - spec/spec_helper.rb

data/a.rb

@@ -1,34 +0,0 @@
-
-$LOAD_PATH.unshift 'lib'
-
-require 'servolux'
-
-STDOUT.sync = true
-
-
-module DoThis
-  def before_executing
-    @fd = File.open("#$$.txt", 'w')
-  end
-
-  def after_executing
-STDOUT.puts "Closing #$$.txt"
-    @fd.close
-  end
-
-  def execute
-    @fd.puts "Process #$$ @ #{Time.now}"
-    sleep 2
-  end
-end
-
-p = Servolux::Prefork.new :module => DoThis
-p.start 6
-gets
-p.stop
-
-p.errors { |w|
-  puts w.error.inspect
-}
-
-Process.waitall

data/b.rb

@@ -1,17 +0,0 @@
-
-$LOAD_PATH.unshift 'lib'
-
-require 'servolux'
-STDOUT.sync = true
-
-p = Servolux::Prefork.new {
-  puts "Process #$$ @ #{Time.now}"
-  sleep
-}
-p.start 12
-sleep 30
-p.stop
-
-p.errors { |e|
-  puts e.inspect
-}