1 files changed, 8 insertions, 3 deletions

diff --git a/src/Network/BitTorrent/Peer/Addr.hs b/src/Network/BitTorrent/Peer/Addr.hs
index 1c2ac2eb..5c05180a 100644
--- a/src/Network/BitTorrent/Peer/Addr.hs
+++ b/src/Network/BitTorrent/Peer/Addr.hs
@@ -6,6 +6,7 @@
 --   Portability :  non-portable
 --
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RecordWildCards #-}
 {-# OPTIONS  -fno-warn-orphans #-}
 module Network.BitTorrent.Peer.Addr
        ( PeerAddr(..)
@@ -17,6 +18,7 @@ import Control.Applicative
 import Data.BEncode
 import Data.Bits
 import Data.Word
+import Text.PrettyPrint
 import Network
 import Network.Socket
 
@@ -73,6 +75,9 @@ connectToPeer p = do
   connect sock (peerSockAddr p)
   return sock
 
-ppPeer :: PeerAddr -> String
-ppPeer p = maybe ""  (++ " at ") ((ppClientInfo . clientInfo) <$> peerID p)
-        ++ show (peerSockAddr p)
+ppPeer :: PeerAddr -> Doc
+ppPeer p @ PeerAddr {..} = case peerID of
+    Just pid -> ppClientInfo (clientInfo pid) <+> "at" <+> paddr
+    Nothing  -> paddr
+  where
+    paddr = text (show (peerSockAddr p))