Merge pull request #22 from phekmat/remote-host-fix

Fix debugging for forking process run on a remote machine

Author: denofevil

lib/ruby-debug-ide.rb

@@ -6,15 +6,15 @@
   require 'ruby-debug-base'
 else
   require 'debase'
-end  
+end
 
 require 'ruby-debug-ide/version'
 require 'ruby-debug-ide/xml_printer'
 require 'ruby-debug-ide/ide_processor'
 require 'ruby-debug-ide/event_processor'
 
 module Debugger
-  
+
   class << self
     # Prints to the stderr using printf(*args) if debug logging flag (-d) is on.
     def print_debug(*args)
@@ -25,7 +25,7 @@ def print_debug(*args)
         $stderr.flush
       end
     end
-    
+
     def cleanup_backtrace(backtrace)
        cleared = []
        return cleared unless backtrace
@@ -40,12 +40,12 @@ def cleanup_backtrace(backtrace)
        end
        cleared
     end
-    
+
     attr_accessor :cli_debug, :xml_debug
     attr_accessor :control_thread
     attr_reader :interface
 
-    
+
     #
     # Interrupts the last debugged thread
     #
@@ -69,10 +69,10 @@ def prepare_debugger(options)
       start_server(options.host, options.port)
 
       raise "Control thread did not start (#{@control_thread}}" unless @control_thread && @control_thread.alive?
-      
+
       @mutex = Mutex.new
       @proceed = ConditionVariable.new
-      
+
       # wait for 'start' command
       @mutex.synchronize do
         @proceed.wait(@mutex)
@@ -89,14 +89,14 @@ def debug_program(options)
         $stderr.print Debugger.cleanup_backtrace(bt.backtrace).map{|l| "\t#{l}"}.join("\n"), "\n"
       end
     end
-    
+
     def run_prog_script
       return unless @mutex
       @mutex.synchronize do
         @proceed.signal
       end
     end
-    
+
     def start_control(host, port)
       raise "Debugger is not started" unless started?
       return if @control_thread
@@ -110,11 +110,12 @@ def start_control(host, port)
           $stderr.printf "Fast Debugger (ruby-debug-ide #{IDE_VERSION}, #{gem_name} #{VERSION}) listens on #{host}:#{port}\n"
           server = TCPServer.new(host, port)
           while (session = server.accept)
-            $stderr.puts "Connected from #{session.addr[2]}" if Debugger.cli_debug
+            $stderr.puts "Connected from #{session.peeraddr[2]}" if Debugger.cli_debug
             dispatcher = ENV['IDE_PROCESS_DISPATCHER']
             if (dispatcher)
-              ENV['IDE_PROCESS_DISPATCHER'] = "#{session.addr[2]}:#{dispatcher}" unless dispatcher.include?(":")
-            end  
+              ENV['IDE_PROCESS_DISPATCHER'] = "#{session.peeraddr[2]}:#{dispatcher}" unless dispatcher.include?(":")
+              ENV['DEBUGGER_HOST'] = host
+            end
             begin
               @interface = RemoteInterface.new(session)
               self.handler = EventProcessor.new(interface)
@@ -132,9 +133,9 @@ def start_control(host, port)
         end
       end
     end
-    
+
   end
-  
+
   class Exception # :nodoc:
     attr_reader :__debug_file, :__debug_line, :__debug_binding, :__debug_context
   end

lib/ruby-debug-ide/multiprocess/pre_child.rb

@@ -5,10 +5,10 @@ def pre_child
 
         require "socket"
         require "ostruct"
-        
-        host = '127.0.0.1'
+
+        host = ENV['DEBUGGER_HOST']
         port = find_free_port(host)
-      
+
         options = OpenStruct.new(
             'frame_bind'  => false,
             'host'        => host,
@@ -18,10 +18,10 @@ def pre_child
             'tracing'     => false,
             'int_handler' => true
         )
-      
+
         acceptor_host, acceptor_port = ENV['IDE_PROCESS_DISPATCHER'].split(":")
         acceptor_host, acceptor_port = '127.0.0.1', acceptor_host unless acceptor_port
-  
+
         connected = false
         3.times do |i|
           begin
@@ -39,28 +39,28 @@ def pre_child
           end unless connected
         end
       end
-      
+
       def start_debugger(options)
         if Debugger.started?
           #we're in forked child, only need to restart control thread
-          Debugger.breakpoints.clear 
+          Debugger.breakpoints.clear
           Debugger.control_thread = nil
           Debugger.start_control(options.host, options.port)
         end
-  
+
         if options.int_handler
           # install interruption handler
           trap('INT') { Debugger.interrupt_last }
         end
-      
+
         # set options
         Debugger.keep_frame_binding = options.frame_bind
-        Debugger.tracing = options.tracing             
-        
+        Debugger.tracing = options.tracing
+
         Debugger.prepare_debugger(options)
       end
-  
-  
+
+
       def find_free_port(host)
         server = TCPServer.open(host, 0)
         port   = server.addr[1]