From: Tom Gilbert <tom@linuxbrit.co.uk>
Date: Mon, 5 Sep 2005 12:06:21 +0000 (+0000)
Subject: better failure to connect behaviour
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=5a06676cdec9d4b43767f39ef2dea3b735a964a5;hp=70b4d72c18d092bf14c982a28e860321f947755c;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

better failure to connect behaviour
---

diff --git a/lib/rbot/ircbot.rb b/lib/rbot/ircbot.rb
index 8e265541..2443ec95 100644
--- a/lib/rbot/ircbot.rb
+++ b/lib/rbot/ircbot.rb
@@ -51,9 +51,6 @@ class IrcBot
   # bot's Language data
   attr_reader :lang
 
-  # bot's configured addressing prefixes
-  attr_reader :addressing_prefixes
-
   # channel info for channels the bot is in
   attr_reader :channels
 
diff --git a/lib/rbot/ircsocket.rb b/lib/rbot/ircsocket.rb
index af605e37..7ceba21b 100644
--- a/lib/rbot/ircsocket.rb
+++ b/lib/rbot/ircsocket.rb
@@ -31,6 +31,7 @@ module Irc
       @server = server.dup
       @port = port.to_i
       @host = host
+      @sock = nil
       @spooler = false
       @lines_sent = 0
       @lines_received = 0
@@ -50,6 +51,7 @@ module Irc
     
     # open a TCP connection to the server
     def connect
+      @sock = nil
       if(@host)
         begin
           @sock=TCPSocket.new(@server, @port, @host)
@@ -165,7 +167,8 @@ module Irc
 
     # shutdown the connection to the server
     def shutdown(how=2)
-      @sock.shutdown(how)
+      @sock.shutdown(how) unless @sock.nil?
+      @sock = nil
     end
 
     private