fix(admin): log admin server exceptions and close admin socket

Admin server was crashing silently and requests hang indefinitely.
With this fix, we are now logging the admin server exceptions and also
close the socket afterwards so admin request don't hang.

Signed-off-by: Taimoor Zaeem <taimoorzaeem@gmail.com>
This commit is contained in:
Taimoor Zaeem
2026-06-29 12:43:54 -05:00
committed by Steve Chavez
parent 18646a6c03
commit b967a5033a
4 changed files with 10 additions and 1 deletions
+1
View File
@@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file. From versio
- Fix unexpected results when embedding and filtering the same table more than once by @laurenceisla in #4075 - Fix unexpected results when embedding and filtering the same table more than once by @laurenceisla in #4075
- If the schema cache fails to reload, PostgREST will no longer stop serving requests and will continue doing so in a "best effort" basis by @mkleczek in #4873 #4869 - If the schema cache fails to reload, PostgREST will no longer stop serving requests and will continue doing so in a "best effort" basis by @mkleczek in #4873 #4869
- Stop reporting 503s errors unnecessarily while the schema cache is loading at startup by @mkleczek in #4880 - Stop reporting 503s errors unnecessarily while the schema cache is loading at startup by @mkleczek in #4880
- Fix admin server not logging cause of failure by @taimoorzaeem in #5012
### Changed ### Changed
+6 -1
View File
@@ -28,7 +28,8 @@ runAdmin appState maybeAdminSocket getSocketREST settings = do
conf <- getConfig appState conf <- getConfig appState
whenJust maybeAdminSocket $ \adminSocket -> do whenJust maybeAdminSocket $ \adminSocket -> do
address <- resolveSocketToAddress adminSocket address <- resolveSocketToAddress adminSocket
void . forkIO $ Warp.runSettingsSocket (adminServerSettings conf address) adminSocket adminApp void . forkIO $ handle (onError adminSocket) $
Warp.runSettingsSocket (adminServerSettings conf address) adminSocket adminApp
where where
adminApp = admin appState getSocketREST adminApp = admin appState getSocketREST
observer = AppState.getObserver appState observer = AppState.getObserver appState
@@ -37,6 +38,10 @@ runAdmin appState maybeAdminSocket getSocketREST settings = do
& Warp.setBeforeMainLoop (observer $ AdminStartObs addr) & Warp.setBeforeMainLoop (observer $ AdminStartObs addr)
& maybe identity Warp.setPort (configAdminServerPort config) & maybe identity Warp.setPort (configAdminServerPort config)
onError adminSock ex = do
observer $ AdminServerCrashedObs ex
NS.close adminSock -- we close the socket so request doesn't hang
-- | PostgREST admin application -- | PostgREST admin application
admin :: AppState.AppState -> IO (Maybe NS.Socket) -> Wai.Application admin :: AppState.AppState -> IO (Maybe NS.Socket) -> Wai.Application
admin appState getSocketREST req respond = do admin appState getSocketREST req respond = do
+2
View File
@@ -132,6 +132,8 @@ observationMessages :: Observation -> [Text]
observationMessages = \case observationMessages = \case
AdminStartObs address -> AdminStartObs address ->
pure $ "Admin server listening on " <> address pure $ "Admin server listening on " <> address
AdminServerCrashedObs ex ->
pure $ "FAILURE: Admin server crashed unexpectedly: " <> (showOnSingleLine '\t' . show) ex
AppStartObs ver -> AppStartObs ver ->
pure $ "Starting PostgREST " <> T.decodeUtf8 ver <> "..." pure $ "Starting PostgREST " <> T.decodeUtf8 ver <> "..."
AppServerAddressObs address -> AppServerAddressObs address ->
+1
View File
@@ -25,6 +25,7 @@ import Protolude hiding (toList)
data Observation data Observation
= AdminStartObs Text = AdminStartObs Text
| AdminServerCrashedObs SomeException
| AppStartObs ByteString | AppStartObs ByteString
| AppServerAddressObs Text | AppServerAddressObs Text
| ExitUnsupportedPgVersion PgVersion PgVersion | ExitUnsupportedPgVersion PgVersion PgVersion