1 files changed, 16 insertions, 4 deletions

diff --git a/Presence/Server.hs b/Presence/Server.hs
index 5dce323c..feefea2b 100644
--- a/Presence/Server.hs
+++ b/Presence/Server.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE OverloadedStrings #-}
 module Server where
 
 import Network.Socket
@@ -73,10 +74,21 @@ doServer port g startCon = runServer2 port (runConn2 g)
         setSocketOption sock ReuseAddr 1
         bindSocket sock (SockAddrInet port iNADDR_ANY)
         listen sock 2
-        mainLoop sock (ConnId 0) go
+        forkIO $ do
+            mainLoop sock (ConnId 0) go
+            L.putStrLn $ "quit accept loop"
+        return sock
      where
         mainLoop sock idnum@(ConnId n) go = do
-            con <- accept sock
-            forkIO $ go (idnum .*. st) con 
-            mainLoop sock (ConnId (n+1)) go
+            let doException (SomeException e) = do
+                Prelude.putStrLn ("\n\naccept-loop exception: " ++ show e ++ "\n\n")
+                return Nothing
+            mcon <- handle doException $ fix $ \loop -> do
+                con <- accept sock
+                return $ Just con
+            case mcon of
+              Just con -> do
+                forkIO $ go (idnum .*. st) con 
+                mainLoop sock (ConnId (n+1)) go
+              Nothing -> return ()