jimmy/postgrest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: simplify main, address reReadConfig TODO

Browse Source
This commit is contained in:
Robert Vollmert
2022-08-02 09:24:14 +02:00
committed by Robert
parent bfacec3a67
commit ec23067e3e
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PostgREST/CLI.hs
+6 -12
View File
@@ -36,18 +36,12 @@ main installSignalHandlers runAppWithSocket CLI{cliCommand, cliPath} = do
conf@AppConfig{..} <- conf@AppConfig{..} <-
either panic identity <$> Config.readAppConfig mempty cliPath Nothing either panic identity <$> Config.readAppConfig mempty cliPath Nothing
appState <- AppState.init conf appState <- AppState.init conf
case cliCommand of
-- Override the config with config options from the db CmdDumpConfig -> do
-- TODO: the same operation is repeated on connectionWorker, ideally this when configDbConfig $ reReadConfig True appState
-- would be done only once, but dump CmdDumpConfig needs it for tests. putStr . Config.toText =<< AppState.getConfig appState
when configDbConfig $ reReadConfig True appState CmdDumpSchema -> putStrLn =<< dumpSchema appState
CmdRun -> App.run installSignalHandlers runAppWithSocket appState
exec cliCommand appState
where
exec :: Command -> AppState -> IO ()
exec CmdDumpConfig appState = putStr . Config.toText =<< AppState.getConfig appState
exec CmdDumpSchema appState = putStrLn =<< dumpSchema appState
exec CmdRun appState = App.run installSignalHandlers runAppWithSocket appState
-- | Dump DbStructure schema to JSON -- | Dump DbStructure schema to JSON
dumpSchema :: AppState -> IO LBS.ByteString dumpSchema :: AppState -> IO LBS.ByteString