0
@@ -108,6 +108,11 @@ def setupConnection(host, port, nickname, sockopts, sleep)
0
     c.registerCallback :error do |socket, message|
0
       STDERR.puts "! #{message}"
0
     end
0
+    c.registerCallback :exception do |socket, message, exception|
0
+      STDERR.puts "! #{message}"
0
+      STDERR.puts exception.message
0
+      PP.pp(exception.backtrace, STDERR)
0
+    end
0
     c.registerCallback :peer_error do |socket, peer, message|
0
       STDERR.puts "! Peer #{peer.host}:#{peer.port}: #{message}"
0
     end

0
@@ -62,7 +62,8 @@ class DCProtocol < EventMachine::Connection
0
       begin
0
         proc.call(self, *args)
0
       rescue Exception => e
0
-        STDERR.puts "Exception: #{e.message}\n#{e.backtrace}"
0
+        STDERR.puts "! Exception: #{e.message}"
0
+        STDERR.puts e.backtrace.join("\n")
0
       end
0
     end
0
   end
0
@@ -322,16 +323,20 @@ class DCClientProtocol < DCProtocol
0
   # utility methods
0
   
0
   def connect_to_peer(ip, port)
0
-    @peers << EventMachine::connect(ip, port, DCPeerProtocol) do |c|
0
-      parent = self
0
-      debug = @debug || @config[:peer_debug]
0
-      c.instance_eval do
0
-        @parent = parent
0
-        @host = ip
0
-        @port = port
0
-        @debug = debug
0
+    begin
0
+      @peers << EventMachine::connect(ip, port, DCPeerProtocol) do |c|
0
+        parent = self
0
+        debug = @debug || @config[:peer_debug]
0
+        c.instance_eval do
0
+          @parent = parent
0
+          @host = ip
0
+          @port = port
0
+          @debug = debug
0
+        end
0
+        c.call_callback :initialized
0
       end
0
-      c.call_callback :initialized
0
+    rescue Exception => e
0
+      call_callback :exception, "Could not connect to peer #{ip}:#{port}", e
0
     end
0
   end
0