From 39f12957f55256db74960b47be3797e881c525b8 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 25 Sep 2019 18:01:20 +0200 Subject: [PATCH] fix: fix startup on unix-socket --- src/Application.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Application.hs b/src/Application.hs index ab50d34e6..1181b9a9f 100644 --- a/src/Application.hs +++ b/src/Application.hs @@ -77,7 +77,7 @@ import System.Posix.Process (getProcessID) import System.Posix.Signals (SignalInfo(..), installHandler, sigTERM) import qualified System.Posix.Signals as Signals (Handler(..)) -import Network.Socket (socketPort) +import Network.Socket (socketPort, Socket, PortNumber) import qualified Network.Socket as Socket (close) import Control.Concurrent.STM.Delay @@ -370,7 +370,7 @@ develMain = runResourceT $ do liftIO . develMainHelper $ return (wsettings, app) -- | The @main@ function for an executable running this site. -appMain :: MonadUnliftIO m => m () +appMain :: forall m. MonadUnliftIO m => m () appMain = runResourceT $ do settings <- getAppSettings @@ -398,7 +398,7 @@ appMain = runResourceT $ do $logInfoS "bind" [st|Listening on #{tshow host} port #{tshow port} as per configuration|] liftIO $ pure <$> bindPortTCP port host - $logDebugS "bind" . tshow =<< mapM (liftIO . socketPort) sockets + $logDebugS "bind" . tshow =<< mapM (liftIO . try . socketPort :: Socket -> _ (Either SomeException PortNumber)) sockets mainThreadId <- myThreadId liftIO . void . flip (installHandler sigTERM) Nothing . Signals.CatchInfo $ \SignalInfo{..} -> runAppLoggingT foundation $ do