playing with drb

lib/steam/browser/html_unit/drb.rb

@@ -7,25 +7,27 @@ class Drb
         autoload :Client,  'steam/browser/html_unit/drb/client'
         autoload :Service, 'steam/browser/html_unit/drb/service'
 
-        def initialize
+        def initialize(connection, options = {})
           DRb.start_service
-          @browser = DRbObject.new(nil, Steam.config[:drb_uri])
+          @drb = DRbObject.new(nil, Steam.config[:drb_uri])
+          @connection = connection
+          @options = options
         end
 
-        def daemonize(connection = nil, options = {})
-          Forker.new { start(connection, options) }
+        def daemonize
+          Forker.new(@options) { start }
           sleep(1) # FIXME
         end
 
-        def start(connection = nil, options = {})
+        def start
           uri = Steam.config[:drb_uri]
-          DRb.start_service(uri, HtmlUnit.new(connection, options))
-          puts "Browser ready and listening at #{uri}"
+          DRb.start_service(uri, HtmlUnit.new(@connection, @options)) rescue Errno::EADDRINUSE
+          puts "HtmlUnit ready and listening at #{uri}"
           DRb.thread.join
         end
 
         def method_missing(method, *args, &block)
-          @browser.send(method, *args, &block)
+          @drb.send(method, *args, &block)
         end
       end
     end

lib/steam/browser/html_unit/forker.rb

@@ -9,22 +9,25 @@ def initialize(options = {}, &block)
         :stdout => $stdout, 
         :stderr => $stderr 
       }.merge(options)
+
+      recall_pid && kill if options[:restart]
 
       @pid = Kernel.fork do 
         STDIN.reopen  options[:stdin]
         STDOUT.reopen options[:stdout]
         STDERR.reopen options[:stderr]
         block.call
       end
-      # write_pid
-      at_exit { kill }
+      write_pid
+      # at_exit { kill }
     end
 
     def interrupt
       kill('INT')
     end
 
     def kill(signal = 'TERM')
+      puts "killing #{@pid}"
       if running?
         Process.kill(Signal.list[signal], @pid)
         delete_pid
@@ -44,6 +47,10 @@ def write_pid
         ::File.open('/tmp/steam.pid', 'w'){ |f| f.write("#{@pid}") }
       end
 
+      def recall_pid
+        @pid = ::File.read('/tmp/steam.pid').to_i rescue nil
+      end
+
       def delete_pid
         ::File.delete('/tmp/steam.pid') rescue Errno::ENOENT
       end

test/playground/drb.rb

@@ -9,9 +9,9 @@
 static = Connection::Static.new(:root => root, :urls => %w(/ /javascripts /stylesheets))
 connection = Rack::Cascade.new([static, @app])
 
-browser = Browser::HtmlUnit::Drb.new
+browser = Browser::HtmlUnit::Drb.new(connection)
 
-browser.daemonize(connection)
+browser.daemonize
 
 browser.request('/index.html')
 p browser.response.status