lib/patronus_fati/connection.rb in patronus_fati-0.8.12 vs lib/patronus_fati/connection.rb in patronus_fati-0.8.13
- old
+ new
@@ -1,12 +1,6 @@
module PatronusFati
- PatronusFatiError = Class.new(StandardError)
- LostConnection = Class.new(PatronusFatiError)
- ConnectionTimeout = Class.new(PatronusFatiError)
- UnableToRead = Class.new(PatronusFatiError)
- UnableToWrite = Class.new(PatronusFatiError)
-
class Connection
attr_reader :port, :read_queue, :server, :write_queue
def initialize(server, port)
@server = server
@@ -60,19 +54,14 @@
self.read_thread = Thread.new do
begin
while (line = socket.readline)
read_queue << line
end
- rescue Timeout::Error => e
- socket.close
- raise ConnectionTimeout, e.message
- rescue EOFError => e
- socket.close
- raise LostConnection, e.message
rescue => e
+ $stderr.puts format('Error in read thread: %s', e.message)
+ ensure
socket.close
- raise UnableToRead, e.message
end
end
end
def start_write_thread
@@ -82,11 +71,12 @@
while (msg = write_queue.pop)
socket.write("!%i %s\r\n" % [count, msg])
count += 1
end
rescue => e
+ $stderr.puts format('Error in write thread: %s', e.message)
+ ensure
socket.close
- raise UnableToWrite, e.message
end
end
end
end
end