urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-24 11:24:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Re-enable local terminal (non-daemon mode) + cancelWait cleanup.

Browse Source
This commit is contained in:
Benjamin Summers 2019-09-18 10:55:21 -07:00
parent b1a9dff197
commit d3d42a7fdd
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/king/lib/Vere/Pier.hs
View File

@ -136,10 +136,7 @@ resumed top flags = do
-- Run Pier --------------------------------------------------------------------
acquireWorker :: RIO e () -> RAcquire e (Async ())
acquireWorker act = mkRAcquire start stop
where
stop t = cancel t >> void (waitCatch t)
start = async act
acquireWorker act = mkRAcquire (async act) cancel
pier :: ∀e. HasLogFunc e
=> FilePath
@ -163,7 +160,7 @@ pier pierPath mPort (serf, log, ss) = do
(demux, muxed) <- atomically $ do
res <- Term.mkDemux
-- Term.addDemux local res
Term.addDemux local res
pure (res, Term.useDemux res)
rio $ logInfo $ display $
@ -380,11 +377,8 @@ runPersist :: EventLog
-> (FX -> STM ())
-> RAcquire e (Async ())
runPersist log inpQ out =
mkRAcquire runThread cancelWait
mkRAcquire runThread cancel
where
cancelWait :: Async () -> RIO e ()
cancelWait tid = cancel tid >> wait tid
runThread :: RIO e (Async ())
runThread = asyncBound $ forever $ do
writs <- atomically getBatchFromQueue