Author: nornagon
Date: 2005-07-05 19:09:09 -0400 (Tue, 05 Jul 2005)
New Revision: 834

Modified:
   trunk/clients/ravish/haver.rb
   trunk/clients/ravish/ravish2.rb
Log:
Connection error handling in ravish2.rb

Modified: trunk/clients/ravish/haver.rb
===================================================================
--- trunk/clients/ravish/haver.rb       2005-07-05 23:08:16 UTC (rev 833)
+++ trunk/clients/ravish/haver.rb       2005-07-05 23:09:09 UTC (rev 834)
@@ -16,17 +16,17 @@
                def start
                        event :connecting
                        Thread.new {
-                               sock = TCPSocket.new(@server, @port)
-                               connect sock
+                               begin
+                                       sock = TCPSocket.new(@server, @port)
+                                       connect sock
+                               rescue StandardError, SocketError => e
+                                       event :link_failed, e
+                               end
                        }
                end
 
                def connect sock
-                       begin
-                               @sock = Haver::Net.new sock, self
-                       rescue StandardError, SocketError => e
-                               event :link_failed, e
-                       end
+                       @sock = Haver::Net.new sock, self
                        @sock.add_observer self
                        event :connected
                end

Modified: trunk/clients/ravish/ravish2.rb
===================================================================
--- trunk/clients/ravish/ravish2.rb     2005-07-05 23:08:16 UTC (rev 833)
+++ trunk/clients/ravish/ravish2.rb     2005-07-05 23:09:09 UTC (rev 834)
@@ -86,6 +86,8 @@
                when :connected
                        srvmsg 'Connected.'
                        @haver.msg 'HAVER', 'Ravish/0.1.0'
+               when :link_failed
+                       srvmsg "Link failed: #{args[0]}"
                when :message_sent
                        srvmsg "%(cmesg)C: #{args[0].inspect}"
                when :message_received
@@ -211,6 +213,6 @@
        end
 end
 
-ravish = Ravish.new 'localhost'
+ravish = Ravish.new 'hardison.net'
 
 EventManager.instance.run


Reply via email to