servolux 0.9.3 → 0.9.4

data/History.txt

@@ -1,3 +1,9 @@
+== 0.9.4 / 2010-04-18
+
+* Bug Fixes
+  * Elminated race condition in logfile watching [Avdi Grimm]
+  * Made program exit optionalx [Avdi Grimm]
+
 == 0.9.3 / 2010-03-10
 
 * Updated to the latest version of Mr Bones

data/Rakefile

@@ -15,9 +15,7 @@ Bones {
   url          'http://gemcutter.org/gems/servolux'
   readme_file  'README.rdoc'
   ignore_file  '.gitignore'
-
   spec.opts << '--color'
-  rubyforge.name 'codeforpeople'
 
   use_gmail
 

data/lib/servolux/daemon.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 # == Synopsis
 # The Daemon takes care of the work of creating and managing daemon
 # processes from Ruby.
@@ -220,21 +222,26 @@ class Servolux::Daemon
     @logfile_reader.look_for = val
   end
 
-  # Start the daemon process.
+  # Start the daemon process. Passing in +false+ to this method will prevent
+  # the parent from exiting after the daemon process starts.
   #
   # @return [Daemon] self
   #
-  def startup
+  def startup( do_exit = true )
     raise Error, "Fork is not supported in this Ruby environment." unless ::Servolux.fork?
     return if alive?
 
     logger.debug "About to fork ..."
     @piper = ::Servolux::Piper.daemon(nochdir, noclose)
 
+    # Make sure we have an idea of the state of the log file BEFORE the child
+    # gets a chance to write to it.
+    @logfile_reader.updated? if @logfile_reader
+
     @piper.parent {
       @piper.timeout = 0.1
       wait_for_startup
-      exit!(0)
+      exit!(0) if do_exit
     }
 
     @piper.child { run_startup_command }
@@ -426,7 +433,8 @@ class Servolux::Daemon
     end
 
     def stat
-      File.stat(@filename) if @filename and test(?f, @filename)
+      s = File.stat(@filename) if @filename && test(?f, @filename)
+      s || OpenStruct.new(:mtime => Time.at(0), :size => 0)
     end
 
     def updated?

data/spec/daemon_spec.rb

@@ -25,7 +25,7 @@ describe Servolux::Daemon do
   end
 
   after(:each) do
-    @daemon.shutdown if defined? @daemon and @daemon
+    @daemon.shutdown if defined? @daemon && @daemon
     FileUtils.rm_f [log_fn, pid_fn]
   end
 
@@ -34,13 +34,8 @@ describe Servolux::Daemon do
     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
-    }
+    @daemon.startup false
+    @daemon.should be_alive
   end
 
   it 'waits for a particular line to appear in the log file' do
@@ -48,13 +43,8 @@ describe Servolux::Daemon do
     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
-    }
+    @daemon.startup false
+    @daemon.should be_alive
   end
 
   it 'raises an error if the startup timeout is exceeded' do

data/spec/server_spec.rb

@@ -34,20 +34,30 @@ 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.running? and t.status == 'sleep'
+    test(?e, @server.pid_file).should be_true
 
     @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
+
+    @server.shutdown
+    Thread.pass until t.status == false
+    test(?e, @server.pid_file).should be_false
   end
 
   it 'generates PID file with the specified permissions' do
     @server.pid_file_mode = 0400
     t = Thread.new {@server.startup}
     Thread.pass until @server.running? and t.status == 'sleep'
+    test(?e, @server.pid_file).should be_true
 
     @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
+
+    @server.shutdown
+    Thread.pass until t.status == false
+    test(?e, @server.pid_file).should be_false
   end
 
   it 'shuts down gracefully when signaled' do

data/version.txt

@@ -1 +1 @@
-0.9.3
+0.9.4

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Tim Pease
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 -07:00
+date: 2010-04-18 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,9 +54,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 3
-        - 0
-        version: 1.3.0
+        - 4
+        - 1
+        version: 1.4.1
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -83,8 +83,8 @@ dependencies:
         segments: 
         - 3
         - 4
-        - 0
-        version: 3.4.0
+        - 1
+        version: 3.4.1
   type: :development
   version_requirements: *id005
 description: |-
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: codeforpeople
+rubyforge_project: servolux
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3