From 9955a172ea1d86a5c480fb9cb3893c6573b0eafa Mon Sep 17 00:00:00 2001 From: Samuel Williams Date: Sat, 12 Mar 2016 01:24:22 +1300 Subject: [PATCH] Use new wrappers. --- lib/celluloid/dns/server.rb | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/lib/celluloid/dns/server.rb b/lib/celluloid/dns/server.rb index ed6a1c3..ea3989f 100644 --- a/lib/celluloid/dns/server.rb +++ b/lib/celluloid/dns/server.rb @@ -24,18 +24,6 @@ require_relative 'logger' module Celluloid::DNS - class UDPSocketWrapper < Celluloid::IO::UDPSocket - def initialize(socket) - @socket = socket - end - end - - class TCPServerWrapper < Celluloid::IO::TCPServer - def initialize(server) - @server = server - end - end - class Server include Celluloid::IO @@ -139,10 +127,10 @@ def run case protocol when Socket::SOCK_DGRAM @logger.info "<> Attaching to pre-existing UDP socket #{ip}:#{port}" - link UDPSocketHandler.new(self, UDPSocketWrapper.new(spec)) + link UDPSocketHandler.new(self, Celluloid::IO::Socket.try_convert(spec)) when Socket::SOCK_STREAM @logger.info "<> Attaching to pre-existing TCP socket #{ip}:#{port}" - link TCPSocketHandler.new(self, TCPServerWrapper.new(spec)) + link TCPSocketHandler.new(self, Celluloid::IO::Socket.try_convert(spec)) else raise ArgumentError.new("Unknown socket protocol: #{protocol}") end