Answer client bind-resource request. Quieted connect-fail messages.

1 files changed, 13 insertions, 13 deletions

diff --git a/Presence/Server.hs b/Presence/Server.hs
index a1c4923b..baf5a1a8 100644
--- a/Presence/Server.hs
+++ b/Presence/Server.hs
@@ -42,7 +42,7 @@ import Control.Monad.Fix
 -- import Control.Monad.STM
 import Control.Monad.Trans.Resource
 import Control.Monad.IO.Class (MonadIO (liftIO))
-import System.IO.Error (ioeGetErrorType)
+import System.IO.Error (ioeGetErrorType,isDoesNotExistError)
 import System.IO 
     ( IOMode(..)
     , hSetBuffering
@@ -311,18 +311,17 @@ server = do
     where 
     forkit = void . forkIO $ do
         proto <- getProtocolNumber "tcp"
-        sock <- bracketOnError
-            (socket (socketFamily addr) Stream proto)
-            (\sock -> do -- only done if there's an error
-                         -- Weird hack: puting the would-be peer address
-                         -- instead of local socketName
+        sock <- socket (socketFamily addr) Stream proto
+        handle (\e -> do -- let t = ioeGetErrorType e
+                         when (isDoesNotExistError e) $ return () -- warn "GOTCHA"
+                         -- warn $ "connect-error: " <> bshow e
                          conkey <- makeConnKey params (sock,addr) -- XXX: ?
                          sClose sock
                          atomically 
                             $ writeTChan (serverEvent server) 
                                 $ (conkey,ConnectFailure addr))
-            $ \sock -> do connect sock addr
-                          return sock
+               $ do
+        connect sock addr
         me <- getSocketName sock
         conkey <- makeConnKey params (sock,me)
         h <- socketToHandle sock ReadWriteMode
@@ -350,9 +349,10 @@ server = do
         fix $ \retryLoop -> do
         utc <- getCurrentTime
         forkIO $ do
-            sock <- bracketOnError
-                (socket (socketFamily addr) Stream proto)
-                (\sock -> do -- only done if there's an error
+            sock <- socket (socketFamily addr) Stream proto
+            handle (\e -> do -- let t = ioeGetErrorType e
+                             when (isDoesNotExistError e) $ return () --  warn "GOTCHA"
+                             -- warn $ "connect-error: " <> bshow e
                              -- Weird hack: puting the would-be peer address
                              -- instead of local socketName
                              conkey <- makeConnKey params (sock,addr) -- XXX: ?
@@ -362,8 +362,8 @@ server = do
                                     $ (conkey,ConnectFailure addr)
                                 retry <- readTVar retryVar
                                 putTMVar resultVar retry)
-                $ \sock -> do connect sock addr
-                              return sock
+                   $ do
+            connect sock addr
             me <- getSocketName sock
             conkey <- makeConnKey params (sock,me)
             h <- socketToHandle sock ReadWriteMode