bitgirder-platform 0.1.25 → 0.1.27

data/bin/install-mysql

@@ -27,6 +27,12 @@ class App < BitGirderClass
     bg_attr :skip_install, processor: :boolean, default: false
     bg_attr :skip_init_db, processor: :boolean, default: false
 
+    bg_attr :max_start_wait, 
+            processor: :integer, 
+            validation: :positive,
+            required: false,
+            default: 30
+
     bg_attr :port, processor: :integer, validation: :positive
 
     bg_attr :root_pass
@@ -154,25 +160,14 @@ class App < BitGirderClass
     end
 
     private
-    def await_sock( tries_remain = 3, stall = 2 )
+    def await_start
         
-        code( "Attempting connect to #@port" )
-
-        begin
-            TCPSocket.new( LOCALHOST, @port ).close
-            code( "Connected" )
-
-        rescue Errno::ECONNREFUSED => e
-
-            if tries_remain > 0 
-
-                code( "No connection, will retry in #{stall}s" )
-                sleep( stall )
-                await_sock( tries_remain - 1, stall * 2 )
-            else
-                raise "Could not connect to #@port"
-            end
-        end
+        opts = { max_wait: @max_start_wait, seed: 1 }
+        
+        WaitCondition.wait_backoff( opts ) do
+            code( "Attempting connect to #@port" )
+            can_connect?( @port )
+        end or raise "Could not connect to mysqld at :#@port"
     end
 
     private
@@ -254,7 +249,7 @@ class App < BitGirderClass
         code( "Started mysqld as #{pid}" )
 
         begin
-            await_sock
+            await_start
             run_db_init
             init_done = true
         ensure

data/lib/bitgirder/core.rb

@@ -1322,20 +1322,35 @@ class WaitCondition < BitGirderClass
     
     private_class_method :new
 
-    def initialize( f, waiter, max_tries )
+    def initialize( f, waiter, opts )
 
         @f, @waiter = f, waiter
-        @max_tries = positive( max_tries, :max_tries )
+        
+        raise "One of :max_tries or :max_wait must be given" unless 
+            opts.key?( :max_tries ) || opts.key?( :max_wait )
+
+        @max_tries = opts.key?( :max_tries ) ?
+            positive( opts[ :max_tries ] ) : 1 << 63
+        
+        @max_wait = opts.key?( :max_wait ) ? 
+            positive( opts[ :max_wait ] ) : Float::INFINITY
     end
 
     public
     def execute
 
         res = nil
+        
+        start = Time.now
 
         @max_tries.times do |i|
+
             break if res = @f.call
-            @waiter.call if i < @max_tries - 1
+
+            remain = @max_wait - ( Time.now - start )
+            break if remain <= 0
+
+            @waiter.call( remain ) if i < @max_tries - 1
         end
 
         res
@@ -1344,15 +1359,14 @@ class WaitCondition < BitGirderClass
     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
+        self.send( :new, blk, waiter, opts ).execute
     end
 
     def self.wait_poll( opts, &blk )
         
         poll = positive( has_key( opts, :poll ), :poll )
-        waiter = lambda { sleep( poll ) }
+        waiter = lambda { |rem| sleep( [ poll, rem ].min ) }
 
         self.create_and_exec( waiter, opts, blk )
     end
@@ -1360,7 +1374,7 @@ class WaitCondition < BitGirderClass
     def self.wait_backoff( opts, &blk )
         
         seed = positive( has_key( opts, :seed ), :seed )
-        waiter = lambda { sleep( seed ); seed *= 2 }
+        waiter = lambda { |rem| sleep( [ seed, rem ].min ); seed *= 2 }
 
         self.create_and_exec( waiter, opts, blk )
     end

data/lib/doc-gen18.rb

@@ -1,5 +1,5 @@
 
-# Autogenerated docs on 2013-05-05 11:22:57 -0700
+# Autogenerated docs on 2013-09-12 12:29:09 -0700
 #
 
 # 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 2013-05-05 11:22:57 -0700
+# Autogenerated docs on 2013-09-12 12:29:09 -0700
 #
 
 # 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.25
+  version: 0.1.27
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-09-12 00:00:00.000000000 Z
 dependencies: []
 description: Contains core classes and interfaces for building event logger implementations.
   Also includes helper classes for incorporating assertions about event logging into