servolux 0.9.0 → 0.9.1

data/History.txt

@@ -1,3 +1,9 @@
+== 0.9.1 / 2010-01-21
+
+* Bug Fixes
+  * Addressing daemon startup issues
+  * Calling a non-existent piper method from the daemon class
+
 == 0.9.0 / 2009-11-30
 
 * Minor Enhancements

data/lib/servolux.rb

@@ -2,7 +2,7 @@
 module Servolux
 
   # :stopdoc:
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/servolux/daemon.rb

@@ -232,7 +232,7 @@ class Servolux::Daemon
     @piper = ::Servolux::Piper.daemon(nochdir, noclose)
 
     @piper.parent {
-      @piper.timeout = 0
+      @piper.timeout = 0.1
       wait_for_startup
       exit!(0)
     }
@@ -340,7 +340,7 @@ class Servolux::Daemon
   def exec( *args )
     logger.debug "Calling: exec(*#{args.inspect})"
     skip = [STDIN, STDOUT, STDERR]
-    skip << @piper.write_io if @piper
+    skip << @piper.socket if @piper
     ObjectSpace.each_object(IO) { |obj|
       next if skip.include? obj
       obj.close rescue nil
@@ -409,6 +409,11 @@ class Servolux::Daemon
     attr_accessor :filename
     attr_reader   :look_for
 
+    def initialize
+      @filename = nil
+      @look_for = nil
+    end
+
     def look_for=( val )
       case val
       when nil;    @look_for = nil
@@ -421,9 +426,7 @@ class Servolux::Daemon
     end
 
     def stat
-      if @filename and test(?f, @filename)
-        File.stat @filename
-      end
+      File.stat(@filename) if @filename and test(?f, @filename)
     end
 
     def updated?

data/lib/servolux/piper.rb

@@ -93,6 +93,9 @@ class Servolux::Piper
   # The timeout in seconds to wait for puts / gets commands.
   attr_accessor :timeout
 
+  # The underlying socket the piper is using for communication.
+  attr_reader :socket
+
   # @overload Piper.new( mode = 'r', opts = {} )
   #   Creates a new Piper instance with the communication pipe configured
   #   using the provided _mode_. The default mode is read-only (from the

data/spec/daemon_spec.rb

@@ -0,0 +1,71 @@
+
+require File.join(File.dirname(__FILE__), %w[spec_helper])
+require 'logger'
+require 'fileutils'
+
+if Servolux.fork?
+
+describe Servolux::Daemon do
+
+  TestServer = Module.new {
+    def before_starting() @counter = 0; end
+    def after_stopping() exit!(0); end
+    def run
+      @counter += 1
+      logger.info "executing run loop [#@counter]"
+    end
+  }
+
+  log_fn = File.join(Dir.pwd, 'tmp.log')
+  pid_fn = File.join(Dir.pwd, 'tmp.pid')
+
+  before(:each) do
+    FileUtils.rm_f [log_fn, pid_fn]
+    @logger = Logger.new log_fn
+  end
+
+  after(:each) do
+    @daemon.shutdown if defined? @daemon and @daemon
+    FileUtils.rm_f [log_fn, pid_fn]
+  end
+
+  it 'waits for an updated logfile when starting' do
+    server = Servolux::Server.new('Hey You', :logger => @logger, :interval => 2, :pid_file => pid_fn)
+    server.extend TestServer
+    @daemon = Servolux::Daemon.new(:server => server, :log_file => log_fn, :timeout => 8)
+
+    piper = Servolux::Piper.new 'r'
+    piper.child { @daemon.startup }
+    piper.parent {
+      Process.wait piper.pid
+      $?.exitstatus.should == 0
+      @daemon.should be_alive
+    }
+  end
+
+  it 'waits for a particular line to appear in the log file' do
+    server = Servolux::Server.new('Hey You', :logger => @logger, :interval => 1, :pid_file => pid_fn)
+    server.extend TestServer
+    @daemon = Servolux::Daemon.new(:server => server, :log_file => log_fn, :look_for => 'executing run loop [2]', :timeout => 8)
+
+    piper = Servolux::Piper.new 'r'
+    piper.child { @daemon.startup }
+    piper.parent {
+      Process.wait piper.pid
+      $?.exitstatus.should == 0
+      @daemon.should be_alive
+    }
+  end
+
+  it 'raises an error if the startup timeout is exceeded' do
+    server = Servolux::Server.new('Hey You', :logger => @logger, :interval => 3600, :pid_file => pid_fn)
+    server.extend TestServer
+    @daemon = Servolux::Daemon.new(:server => server, :log_file => log_fn, :look_for => 'executing run loop [42]', :timeout => 4)
+
+    lambda { @daemon.startup }.should raise_error(Servolux::Daemon::Timeout)
+  end
+
+end
+
+end  # if Servolux.fork?
+

data/spec/piper_spec.rb

@@ -60,7 +60,7 @@ describe Servolux::Piper do
       @piper.gets.should == 2
       @piper.gets.should == 3
 
-      @piper.timeout = 0
+      @piper.timeout = 0.1
       @piper.readable?.should be_false
     }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: servolux
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 -07:00
+date: 2010-01-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.2.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: bones-git
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.2
+        version: 1.3.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.1.0
+        version: 3.2.0
     version: 
 description: |-
   Serv-O-Lux is a collection of Ruby classes that are useful for daemon and
@@ -90,6 +90,7 @@ files:
 - lib/servolux/server.rb
 - lib/servolux/threaded.rb
 - spec/child_spec.rb
+- spec/daemon_spec.rb
 - spec/piper_spec.rb
 - spec/prefork_spec.rb
 - spec/server_spec.rb