king: Renamed %eyre modules.

This commit is contained in:
Benjamin Summers 2020-05-08 11:29:18 -07:00
parent 5ba113b499
commit 4b6c2c6ce0
3 changed files with 9 additions and 9 deletions

View File

@ -22,8 +22,8 @@
"hosed";
-}
module Urbit.Vere.Http.Server
( serv
module Urbit.Vere.Eyre
( eyre
, multiServ
, ShipAPI(..)
)
@ -31,9 +31,9 @@ where
import Urbit.Prelude hiding (Builder)
import Urbit.Arvo hiding (ServerId, reqUrl, secure)
import Urbit.Arvo hiding (ServerId, reqUrl, secure)
import Urbit.King.Config
import Urbit.Vere.Http.Server.WAIApp hiding (ReqId)
import Urbit.Vere.Eyre.Wai hiding (ReqId)
import Urbit.Vere.Pier.Types
import Data.PEM (pemParseBS, pemWriteBS)
@ -435,10 +435,10 @@ killServ Serv{..} = do
kill :: HasLogFunc e => Drv -> RIO e ()
kill (Drv v) = stopService v killServ >>= fromEither
serv :: e. HasShipEnv e
eyre :: e. HasShipEnv e
=> KingId -> QueueEv -> Bool
-> ([Ev], RAcquire e (EffCb e HttpServerEf))
serv king plan isFake =
eyre king plan isFake =
(initialEvents, runHttpServer)
where
initialEvents :: [Ev]

View File

@ -11,7 +11,7 @@
request.
-}
module Urbit.Vere.Http.Server.WAIApp
module Urbit.Vere.Eyre.Wai
( ReqId
, RespAct(..)
, RespApi(..)

View File

@ -23,8 +23,8 @@ import Urbit.King.App (HasConfigDir(..), HasStderrLogFunc(..))
import Urbit.Vere.Ames (ames)
import Urbit.Vere.Behn (behn)
import Urbit.Vere.Clay (clay)
import Urbit.Vere.Eyre (eyre)
import Urbit.Vere.Http.Client (client)
import Urbit.Vere.Http.Server (serv)
import Urbit.Vere.Log (EventLog)
import Urbit.Vere.Serf (Serf, SerfState(..), doJob, sStderr)
@ -294,7 +294,7 @@ drivers inst who isFake plan shutdownSTM termSys stderr =
where
(behnBorn, runBehn) = behn inst plan
(amesBorn, runAmes) = ames inst who isFake plan stderr
(httpBorn, runHttp) = serv inst plan isFake
(httpBorn, runHttp) = eyre inst plan isFake
(clayBorn, runClay) = clay inst plan
(irisBorn, runIris) = client inst plan
(termBorn, runTerm) = Term.term termSys shutdownSTM inst plan