1652c10 · obelisk · git.iko.soy

git.iko.soy/obelisk

Clean up logging messages

commit1652c10b673348791f89543bd442e1fc50c6846c author3noch <eacameron@gmail.com> dateWed 30 May 2018, 00:32 (8 years ago) parent4f3a469

2 files changed+5−4

unifiedsplit

lib/command/src/Obelisk/Command.hs+1−1

@@ -153,7 +153,7 @@ deployCommand cfg = hsubparser $ mconcat

153153 enabledByDefault = _argsConfig_enableVmBuilderByDefault cfg

154154 enabled = Just RemoteBuilder_ObeliskVM

155155 flagBase = "vm-builder"

156− flagDesc = "managed Linux virtual machine and allow builds to use it (requires Docker)"

156+ flagDesc = "managed Linux virtual machine as a Nix remote builder (requires Docker)"

157157

158158

159159deployInitOpts :: Parser DeployInitOpts

lib/command/src/Obelisk/Command/VmBuilder.hs+4−3

@@ -45,7 +45,7 @@ containerName = "obelisk-docker-nix-builder"

4545containerExists :: MonadObelisk m => m Bool

4646containerExists = withExitFailMessage needDockerMsg $ do

4747 containerNames <- fmap (map T.strip . T.lines . T.pack) $

48− readProcessAndLogStderr Warning $

48+ readProcessAndLogStderr Error $

4949 proc "docker" ["container", "list", "--format", "{{.Names}}"]

5050 pure $ containerName `elem` containerNames

5151 where

@@ -57,8 +57,9 @@ containerSshPort = 2222

5757

5858-- | Start the Docker container; assumes it already exists.

5959startContainer :: MonadObelisk m => m ()

60−startContainer = callProcessAndLogOutput (Notice, Warning) $

61− proc "docker" ["start", containerName]

60+startContainer = withSpinner "Starting VM builder" $

61+ callProcessAndLogOutput (Debug, Debug) $

62+ proc "docker" ["start", containerName]

6263

6364-- | Creates the Docker container; assumes it does not exist.

6465setupNixDocker :: MonadObelisk m => FilePath -> m ()