From 0d7f4e94223bb7413b98f39ac03ddc2970f2bbb3 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Thu, 20 Oct 2011 09:03:23 +0000
Subject: [PATCH] remove Socket#mogilefs_peername

One tiny step in removing core class changes.
---
 lib/mogilefs/backend.rb | 6 +++++-
 lib/mogilefs/util.rb    | 5 -----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/mogilefs/backend.rb b/lib/mogilefs/backend.rb
index 80f714f..407a861 100644
--- a/lib/mogilefs/backend.rb
+++ b/lib/mogilefs/backend.rb
@@ -229,7 +229,7 @@ class MogileFS::Backend
       return true if found && found[0]
       timeleft -= (Time.now - t0)
       timeleft >= 0 and next
-      peer = io ? "#{io.mogilefs_peername} " : nil
+      peer = io ? "#{peername(io)} " : nil
 
       raise MogileFS::UnreadableSocketError, "#{peer}never became readable"
     end
@@ -297,5 +297,9 @@ class MogileFS::Backend
     str.gsub(/%([a-f0-9][a-f0-9])/i) { [$1.to_i(16)].pack 'C' }.tr('+', ' ')
   end
 
+  def peername(io) # :nodoc:
+    Socket.unpack_sockaddr_in(io.getpeername).
+           reverse!.map! { |x| x.to_s }.join(':')
+  end
 end
 
diff --git a/lib/mogilefs/util.rb b/lib/mogilefs/util.rb
index a783fd8..d621cc1 100644
--- a/lib/mogilefs/util.rb
+++ b/lib/mogilefs/util.rb
@@ -113,11 +113,6 @@ class MogileFS::Timeout < Timeout::Error; end
 class Socket
   attr_accessor :mogilefs_addr, :mogilefs_connected, :mogilefs_size
 
-  # Socket lacks peeraddr method of the IPSocket/TCPSocket classes
-  def mogilefs_peername
-    Socket.unpack_sockaddr_in(getpeername).reverse.map {|x| x.to_s }.join(':')
-  end
-
   def mogilefs_init(host = nil, port = nil)
     return true if defined?(@mogilefs_connected)
 
-- 
2.11.4.GIT