Fix compiling on windows(unix socket issue)

Group unix socket functionality into its own module

main/Main.hs

@@ -16,24 +16,13 @@ import Data.Either.Combinators  (whenLeft)
 import Data.IORef               (IORef, atomicWriteIORef, newIORef,
                                  readIORef)
 import Data.String              (IsString (..))
-import Data.Text                (pack, replace, strip, stripPrefix,
+import Data.Text                (pack, replace, strip, stripPrefix)
-                                 unpack)
 import Data.Text.Encoding       (decodeUtf8, encodeUtf8)
 import Data.Text.IO             (hPutStrLn, readFile)
 import Data.Time.Clock          (getCurrentTime)
-import Network.Socket           (Family (AF_UNIX),
-                                 SockAddr (SockAddrUnix), Socket,
-                                 SocketType (Stream), bind, close,
-                                 defaultProtocol, listen,
-                                 maxListenQueue, socket)
 import Network.Wai.Handler.Warp (defaultSettings, runSettings,
-                                 runSettingsSocket, setHost, setPort,
+                                 setHost, setPort, setServerName)
-                                 setServerName)
-import System.Directory         (removeFile)
 import System.IO                (BufferMode (..), hSetBuffering)
-import System.IO.Error          (isDoesNotExistError)
-import System.Posix.Files       (setFileMode)
-import System.Posix.Types       (FileMode)
 
 import PostgREST.App         (postgrest)
 import PostgREST.Config      (AppConfig (..), configPoolTimeout',
@@ -50,8 +39,10 @@ import Protolude             hiding (hPutStrLn, head, replace)
 
 #ifndef mingw32_HOST_OS
 import System.Posix.Signals
+import UnixSocket
 #endif
 
+
 {-|
   The purpose of this worker is to fill the refDbStructure created in 'main'
   with the 'DbStructure' returned from calling 'getDbStructure'. This method
@@ -188,7 +179,6 @@ main = do
   whenLeft roleClaimKey $
     panic $ show roleClaimKey
 
-  --
   -- create connection pool with the provided settings, returns either
   -- a 'Connection' or a 'ConnectionError'. Does not throw.
   pool <- P.acquire (configPool conf, configPoolTimeout' conf, pgSettings)
@@ -251,19 +241,17 @@ main = do
              schemas
              refDbStructure
              refIsWorkerOn)
-    in case maybeSocketAddr of
+
-         Nothing -> do
+  -- run the postgrest application with user defined socket. Only for UNIX systems.
-             -- run the postgrest application
+#ifndef mingw32_HOST_OS
-             putStrLn $ ("Listening on port " :: Text) <> show (configPort conf)
+  whenJust maybeSocketAddr $
-             runSettings appSettings postgrestApplication
+    runAppInSocket appSettings postgrestApplication socketFileMode
-         Just socketAddr -> do
+#endif
-             -- run postgrest application with user defined socket
+
-             sock <- createAndBindSocket (unpack socketAddr) (rightToMaybe socketFileMode)
+  -- run the postgrest application
-             listen sock maxListenQueue
+  whenNothing maybeSocketAddr $ do
-             putStrLn $ ("Listening on unix socket " :: Text) <> show socketAddr
+    putStrLn $ ("Listening on port " :: Text) <> show (configPort conf)
-             runSettingsSocket appSettings sock postgrestApplication
+    runSettings appSettings postgrestApplication
-             -- clean socket up when done
-             close sock
 
 {-|
   The purpose of this function is to load the JWT secret from a file if
@@ -332,15 +320,11 @@ loadDbUriFile conf = extractDbUri mDbUri
         Just filename -> strip <$> readFile (toS filename)
     setDbUri dbUri = conf {configDatabase = dbUri}
 
-createAndBindSocket :: FilePath -> Maybe FileMode -> IO Socket
+-- Utilitarian functions.
-createAndBindSocket socketFilePath maybeSocketFileMode = do
+whenJust :: Applicative f => Maybe a -> (a -> f ()) -> f ()
-  deleteSocketFileIfExist socketFilePath
+whenJust (Just x) f = f x
-  sock <- socket AF_UNIX Stream defaultProtocol
+whenJust Nothing _  = pass
-  bind sock $ SockAddrUnix socketFilePath
+
-  mapM_ (setFileMode socketFilePath) maybeSocketFileMode
+whenNothing :: Applicative f => Maybe a -> f () -> f ()
-  return sock
+whenNothing Nothing f = f
-  where
+whenNothing _       _ = pass
-    deleteSocketFileIfExist path = removeFile path `catch` handleDoesNotExist
-    handleDoesNotExist e
-      | isDoesNotExistError e = return ()
-      | otherwise = throwIO e

main/UnixSocket.hs

@@ -0,0 +1,40 @@
+module UnixSocket (
+  runAppInSocket
+)where
+
+import Network.Socket           (Family (AF_UNIX),
+                                 SockAddr (SockAddrUnix), Socket,
+                                 SocketType (Stream), bind, close,
+                                 defaultProtocol, listen,
+                                 maxListenQueue, socket)
+import Network.Wai              (Application)
+import Network.Wai.Handler.Warp
+import System.Directory         (removeFile)
+import System.IO.Error          (isDoesNotExistError)
+import System.Posix.Files       (setFileMode)
+import System.Posix.Types       (FileMode)
+
+import Protolude
+
+createAndBindSocket :: FilePath -> Maybe FileMode -> IO Socket
+createAndBindSocket socketFilePath maybeSocketFileMode = do
+  deleteSocketFileIfExist socketFilePath
+  sock <- socket AF_UNIX Stream defaultProtocol
+  bind sock $ SockAddrUnix socketFilePath
+  mapM_ (setFileMode socketFilePath) maybeSocketFileMode
+  return sock
+  where
+    deleteSocketFileIfExist path = removeFile path `catch` handleDoesNotExist
+    handleDoesNotExist e
+      | isDoesNotExistError e = return ()
+      | otherwise = throwIO e
+
+-- run the postgrest application with user defined socket.
+runAppInSocket :: Settings -> Application -> Either Text FileMode -> FilePath -> IO ()
+runAppInSocket settings app socketFileMode sockPath = do
+  sock <- createAndBindSocket sockPath (rightToMaybe socketFileMode)
+  putStrLn $ ("Listening on unix socket " :: Text) <> show sockPath
+  listen sock maxListenQueue
+  runSettingsSocket settings sock app
+  -- clean socket up when done
+  close sock

postgrest.cabal

@@ -107,6 +107,7 @@ executable postgrest
                     , retry             >= 0.7.4 && < 0.9
                     , text              >= 1.2.2 && < 1.3
                     , time              >= 1.6 && < 1.10
+                    , wai               >= 3.2.1 && < 3.3
                     , warp              >= 3.2.12 && < 3.4
   default-language:   Haskell2010
   default-extensions: OverloadedStrings
@@ -116,6 +117,7 @@ executable postgrest
 
   if !os(windows)
     build-depends: unix
+    other-modules: UnixSocket
 
 test-suite spec
   type:               exitcode-stdio-1.0

src/PostgREST/Config.hs

@@ -75,7 +75,7 @@ data AppConfig = AppConfig {
   , configSchemas           :: NonEmpty Text
   , configHost              :: Text
   , configPort              :: Int
-  , configSocket            :: Maybe Text
+  , configSocket            :: Maybe FilePath
   , configSocketMode        :: Either Text FileMode
 
   , configJwtSecret         :: Maybe B.ByteString
@@ -159,7 +159,7 @@ readOptions = do
         <*> (fromList . splitOnCommas <$> reqValue "db-schema")
         <*> (fromMaybe "!4" <$> optString "server-host")
         <*> (fromMaybe 3000 <$> optInt "server-port")
-        <*> optString "server-unix-socket"
+        <*> (fmap unpack <$> optString "server-unix-socket")
         <*> parseSocketFileMode "server-unix-socket-mode"
         <*> (fmap encodeUtf8 <$> optString "jwt-secret")
         <*> (fromMaybe False <$> optBool "secret-is-base64")