digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-11-10 00:35:25 +03:00
Code Issues Projects Releases Wiki Activity

Dont occlude --port flag in daml ledger navigator (#2590)

Browse Source
This commit is contained in:
associahedron 2019-08-21 09:58:22 +01:00 committed by GitHub
parent 4c53841eeb
commit 8b3f746da9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
daml-assistant/daml-helper/src/DA/Daml/Helper/Run.hs
View File

@ -811,7 +811,6 @@ runLedgerNavigator flags remainingArguments = do
navigatorArgs = concat
[ ["server"]
, [host hostAndPort, show (port hostAndPort)]
, navigatorPortNavigatorArgs navigatorPort
, remainingArguments
]
@ -819,15 +818,8 @@ runLedgerNavigator flags remainingArguments = do
unsetEnv "DAML_PROJECT" -- necessary to prevent config contamination
withCurrentDirectory confDir $ do
withJar navigatorPath navigatorArgs $ \ph -> do
putStrLn "Waiting for navigator to start: "
-- TODO We need to figure out a sane timeout for this step.
waitForHttpServer (putStr "." *> threadDelay 500000) (navigatorURL navigatorPort)
putStr . unlines $
[ ""
, "Navigator is running at " <> navigatorURL navigatorPort
, "Use Ctrl+C to stop."
]
exitWith =<< waitExitCode ph
exitCode <- waitExitCode ph
exitWith exitCode
where
navigatorConfig :: [PartyDetails] -> T.Text
@ -847,7 +839,6 @@ runLedgerNavigator flags remainingArguments = do
]
, [" }"]
]
navigatorPort = NavigatorPort 7500
getDarPath :: IO FilePath
getDarPath = do