Skip to content

refactor: log server listening observations after listening socket is ready #5037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
taimoorzaeem merged 1 commit into from
Jun 26, 2026
+8 −9
Merged

refactor: log server listening observations after listening socket is ready #5037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/PostgREST/Admin.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,14 @@ runAdmin appState maybeAdminSocket getSocketREST settings = do
conf <- getConfig appState
whenJust maybeAdminSocket $ \adminSocket -> do
address <- resolveSocketToAddress adminSocket
observer $ AdminStartObs address
void . forkIO $ Warp.runSettingsSocket (adminServerSettings conf) adminSocket adminApp
void . forkIO $ Warp.runSettingsSocket (adminServerSettings conf address) adminSocket adminApp
where
adminApp = admin appState getSocketREST
observer = AppState.getObserver appState
adminServerSettings config =
case configAdminServerPort config of
Just p -> settings & Warp.setPort p
Nothing -> settings
adminServerSettings config addr=
settings
& Warp.setBeforeMainLoop (observer $ AdminStartObs addr)
& maybe identity Warp.setPort (configAdminServerPort config)

-- | PostgREST admin application
admin :: AppState.AppState -> IO (Maybe NS.Socket) -> Wai.Application
Expand Down
6 changes: 3 additions & 3 deletions src/PostgREST/App.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import Data.Either.Combinators (mapLeft, whenLeft)
import Data.IORef (atomicWriteIORef, newIORef,
readIORef)
import Data.String (IsString (..), String)
import Network.Wai.Handler.Warp (defaultSettings, setHost,
setOnException, setPort,
import Network.Wai.Handler.Warp (defaultSettings, setBeforeMainLoop,
setHost, setOnException, setPort,
setServerName)

import qualified Data.Text.Encoding as T
Expand Down Expand Up @@ -104,12 +104,12 @@ run appState = do
let app = postgrest appState (AppState.schemaCacheLoader appState)

address <- resolveSocketToAddress mainSocket
observer $ AppServerAddressObs address

let
appServerSettings = serverSettings conf
& setPort (configServerPort conf)
& setOnException onWarpException
& setBeforeMainLoop (observer $ AppServerAddressObs address)

Warp.runSettingsSocket appServerSettings mainSocket app
where
Expand Down