summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Sima <ben@bsima.me>2021-02-17 20:28:51 -0500
committerBen Sima <ben@bsima.me>2021-02-17 20:28:51 -0500
commitdda25240553486522c953e7a1f43ae67dbe2f22a (patch)
tree353ffddcac9b0b7e0d3626899b2c3aafbf08d630
parentad3102e108562aa7c12e89991eb387cd3aa359ae (diff)
Fixup some modules
-rw-r--r--Biz/Bild.hs5
-rw-r--r--Hero/Host.hs13
-rw-r--r--Miso/Extend.hs2
3 files changed, 14 insertions, 6 deletions
diff --git a/Biz/Bild.hs b/Biz/Bild.hs
index 39d8aaf..eee7eb4 100644
--- a/Biz/Bild.hs
+++ b/Biz/Bild.hs
@@ -478,7 +478,10 @@ run Proc {..} = do
Async.runConcurrently
<| Async.Concurrently (puts stdout_)
*> (Async.Concurrently <| Conduit.waitForStreamingProcess cph)
- else Async.runConcurrently <| Async.Concurrently <| Conduit.waitForStreamingProcess cph
+ else
+ Async.runConcurrently
+ <| Async.Concurrently
+ <| Conduit.waitForStreamingProcess cph
if isFailure exitcode
then puts stderr_ >> onFailure >> return exitcode
else onSuccess >> return exitcode
diff --git a/Hero/Host.hs b/Hero/Host.hs
index af0e134..3f6df8e 100644
--- a/Hero/Host.hs
+++ b/Hero/Host.hs
@@ -29,6 +29,7 @@
-- : dep mtl
-- : dep network-uri
-- : dep protolude
+-- : dep rainbow
-- : dep safecopy
-- : dep servant
-- : dep servant-auth
@@ -56,6 +57,7 @@ where
import Alpha
import Biz.App (CSS (..), Manifest (..))
import qualified Biz.Cli as Cli
+import qualified Biz.Log as Log
import Biz.Test ((@=?))
import qualified Biz.Test as Test
import qualified Clay
@@ -63,6 +65,7 @@ import qualified Crypto.JOSE.JWK as Crypto
import Data.Acid (AcidState)
import qualified Data.Acid.Abstract as Acid
import Data.Text (Text)
+import qualified Data.Text as Text
import qualified Data.Text.Lazy as Lazy
import Hero.Core
import qualified Hero.Keep as Keep
@@ -112,11 +115,11 @@ move _ = bracket startup shutdown run
do
keep <- Keep.open (heroKeep cfg)
skey <- upsertKey (heroSkey cfg)
- say "hero"
- prn <| "port: " ++ show (heroPort cfg)
- prn <| "keep: " ++ heroKeep cfg
- prn <| "node: " ++ heroNode cfg
- prn <| "skey: " ++ heroSkey cfg
+ Log.info ["!", "hero"] >> Log.br
+ Log.info ["port", show <| heroPort cfg] >> Log.br
+ Log.info ["keep", Text.pack <| heroKeep cfg] >> Log.br
+ Log.info ["node", Text.pack <| heroNode cfg] >> Log.br
+ Log.info ["skey", Text.pack <| heroSkey cfg] >> Log.br
let jwts = Auth.defaultJWTSettings skey
cs =
Auth.defaultCookieSettings
diff --git a/Miso/Extend.hs b/Miso/Extend.hs
index e7a9ff6..9ebdd08 100644
--- a/Miso/Extend.hs
+++ b/Miso/Extend.hs
@@ -1,4 +1,5 @@
{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE NoImplicitPrelude #-}
module Miso.Extend
( crossorigin_,
@@ -6,6 +7,7 @@ module Miso.Extend
)
where
+import Alpha
import Miso
import Miso.String