Improved netcrypto session cleanup.

1 files changed, 4 insertions, 1 deletions

diff --git a/server/src/Network/StreamServer.hs b/server/src/Network/StreamServer.hs
index 8ebdf678..eda5212f 100644
--- a/server/src/Network/StreamServer.hs
+++ b/server/src/Network/StreamServer.hs
@@ -161,8 +161,11 @@ acceptLoop cfg sock n = handle (acceptException cfg n sock) $ do
     let conkey = n + 1
     laddr <- Socket.getSocketName con
     h <- socketToHandle con ReadWriteMode
+    let tlbl = case canonize laddr of
+            SockAddrUnix {} -> show laddr ++ "," ++ show n
+            _               -> show raddr
     forkIO $ do
-        myThreadId >>= flip labelThread ("stream.session." ++ show (canonize raddr))
+        myThreadId >>= flip labelThread ("stream.session." ++ tlbl)
         serverSession cfg (restrictHandleSocket h con, (Local laddr, Remote raddr)) conkey h
     acceptLoop cfg sock (n + 1)