bitgirder-platform 0.1.10 → 0.1.11

data/bin/tomcat7

@@ -429,18 +429,20 @@ class Daemon < RuntimeCommand
     private
     def await_start
         
-        connected = 4.times.find do |i|
-            begin
-                TCPSocket::new( "localhost", @config.control_port ).close
-                true
-            rescue Errno::ECONNREFUSED
-                code( "Server ctl port not up yet; waiting" )
-                sleep( 2 ** i )
-                false
-            end
-        end 
-
-        raise "Could not get a ctl port connection" unless connected
+        ports = [ @config.control_port ] +
+                [ :http_port, :https_port ].
+                    map { |p| @config.send( p ) }.
+                    select { |p| p }
+
+        code( "Awaiting connection on ports: #{ports}" )
+
+        ports.each do |p|
+            WaitCondition.wait_backoff( seed: 1, max_tries: 4 ) do
+                res = can_connect?( p )
+                code( "Got conn on :#{p}: #{res}" )
+                res
+            end or raise "Could not get connection on :#{p}"
+        end
     end
 
     private
@@ -486,42 +488,23 @@ class Daemon < RuntimeCommand
     end
 
     private
-    def await_port_close( port )
-        
-        3.times do |i|
-            begin
-                TCPSocket.new( "localhost", port ).close
-                code( "Still got a connection at :#{port}; will retry" )
-                sleep( 2 )
-            rescue Errno::ECONNREFUSED
-                return true
-            end
-        end
-
-        return false
-    end
-
-    private
-    def await_srv_close
+    def await_proc_exit( pid )
         
-        to_check = [ @config.control_port ]
-        to_check << @config.http_port if @config.http_port
-        to_check << @config.https_port if @config.https_port
-        
-        # Returns true if and only if all ports are seen closed
-        ! to_check.find do |port|
-            ! await_port_close( port )
-        end
+        pc = ProcessCheck.for_pid( pid )
+#        WaitCondition.wait_backoff( seed: 1, max_tries: 3 ) { ! pc.alive? }
+        WaitCondition.wait_backoff( seed: 1, max_tries: 3 ) { 
+            res = ! pc.alive? 
+            code( "tomcat #{pid} is stopped: #{res}" )
+            res
+        }
     end
 
     private
     def do_stop
         
-        pid = get_current_pid
-        
         send_shutdown
         
-        unless await_srv_close
+        unless await_proc_exit( pid = get_current_pid )
             code( "Server appears to still be running; sending KILL to #{pid}" )
             Process.kill( "KILL", pid )
         end

data/lib/bitgirder/core.rb

@@ -1317,5 +1317,53 @@ class DefaultObjectPathFormatter
     end
 end
 
+class WaitCondition < BitGirderClass
+    
+    private_class_method :new
+
+    def initialize( f, waiter, max_tries )
+
+        @f, @waiter = f, waiter
+        @max_tries = positive( max_tries, :max_tries )
+    end
+
+    public
+    def execute
+
+        res = nil
+
+        @max_tries.times do |i|
+            break if res = @f.call
+            @waiter.call if i < @max_tries - 1
+        end
+
+        res
+    end
+
+    def self.create_and_exec( waiter, opts, blk )
+        
+        raise "No block given" unless blk
+        max_tries = has_key( opts, :max_tries )
+
+        self.send( :new, blk, waiter, max_tries ).execute
+    end
+
+    def self.wait_poll( opts, &blk )
+        
+        poll = positive( has_key( opts, :poll ), :poll )
+        waiter = lambda { sleep( poll ) }
+
+        self.create_and_exec( waiter, opts, blk )
+    end
+
+    def self.wait_backoff( opts, &blk )
+        
+        seed = positive( has_key( opts, :seed ), :seed )
+        waiter = lambda { sleep( seed ); seed *= 2 }
+
+        self.create_and_exec( waiter, opts, blk )
+    end
+end
+
 end
 end

data/lib/bitgirder/io.rb

@@ -9,6 +9,7 @@ require 'json'
 require 'yaml'
 require 'base64'
 require 'tmpdir'
+require 'socket'
 
 include BitGirder::Core
 include BitGirderMethods
@@ -353,6 +354,32 @@ end
 
 module_function :read_full
 
+def can_connect?( *argv )
+    
+    code( "In can_connect, argv: #{argv}" )
+    raise "Need at least a port" if argv.empty?
+
+    host = argv.first.is_a?( String ) ? argv.shift : "127.0.0.1"
+
+    raise "Need a port" if argv.empty?
+
+    unless ( port = argv.shift ).is_a?( Integer )
+        raise TypeError, "Invalid host or port value: #{port.class}" 
+    end
+
+    begin
+        code( "Making connection" )
+        TCPSocket::new( host, port ).close
+        code( "Got conn" )
+        true
+    rescue Errno::ECONNREFUSED
+        code( "No conn" )
+        false
+    end
+end
+
+module_function :can_connect?
+
 class DataUnitError < StandardError; end
 
 class DataUnit < BitGirderClass
@@ -961,5 +988,38 @@ class UnixProcessBuilder < BitGirderClass
     end
 end
 
+class ProcessCheck < BitGirderClass
+
+    private_class_method :new
+
+    def initialize( pid, ps_str )
+        
+        @pid, @ps_str = pid, ps_str
+    end
+
+    public
+    def alive?
+        self.class.ps_str_for( @pid ) == @ps_str
+    end
+
+    def self.ps_str_for( pid )
+        
+        res = `ps -p #{pid} -w -o command= -o lstart=`.chomp
+        res = nil if res.empty?
+
+        unless $?.success? || ( ( ex = $?.exitstatus ) == 1 && res == nil )
+            raise "Couldn't get ps info for #{pid} (ps exited #{ex}: #{res})"
+        end
+
+        res
+    end
+
+    def self.for_pid( pid )
+        
+        ps_str = self.ps_str_for( pid )
+        self.send( :new, pid, ps_str )
+    end
+end
+
 end
 end

data/lib/doc-gen18.rb

@@ -1,5 +1,5 @@
 
-# Autogenerated docs on 2012-12-04 17:20:26 -0800
+# Autogenerated docs on 2012-12-05 10:36:26 -0800
 #
 
 # This code is only included for rdoc purposes and would not normally get

data/lib/doc-gen20.rb

@@ -1,5 +1,5 @@
 
-# Autogenerated docs on 2012-12-04 17:20:26 -0800
+# Autogenerated docs on 2012-12-05 10:36:26 -0800
 #
 
 # This code is only included for rdoc purposes and would not normally get

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitgirder-platform
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors: