cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sigel didn't work out 

Unicode output failed in docker, due to no locales, and would be generally
shakey from haskell in all the environments propellor needs to run in.
This commit is contained in:
Joey Hess 2014-11-19 21:51:52 -04:00
parent 7c11d68018
commit b7d78e679a
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Propellor/Message.hs
View File

@ -60,7 +60,6 @@ actionMessage' mhn desc a = do
liftIO $ do liftIO $ do
whenConsole h $ whenConsole h $
setTitle "propellor: running" setTitle "propellor: running"
putStr propellorSigel
showhn h mhn showhn h mhn
putStr $ desc ++ " ... " putStr $ desc ++ " ... "
let (msg, intensity, color) = getActionResult r let (msg, intensity, color) = getActionResult r
@ -80,12 +79,12 @@ actionMessage' mhn desc a = do
warningMessage :: MonadIO m => String -> m () warningMessage :: MonadIO m => String -> m ()
warningMessage s = liftIO $ do warningMessage s = liftIO $ do
h <- mkMessageHandle h <- mkMessageHandle
colorLine h Vivid Magenta $ propellorSigel ++ "** warning: " ++ s colorLine h Vivid Magenta $ "** warning: " ++ s
errorMessage :: MonadIO m => String -> m a errorMessage :: MonadIO m => String -> m a
errorMessage s = liftIO $ do errorMessage s = liftIO $ do
h <- mkMessageHandle h <- mkMessageHandle
colorLine h Vivid Red $ propellorSigel ++ "** error: " ++ s colorLine h Vivid Red $ "** error: " ++ s
error "Cannot continue!" error "Cannot continue!"
colorLine :: MessageHandle -> ColorIntensity -> Color -> String -> IO () colorLine :: MessageHandle -> ColorIntensity -> Color -> String -> IO ()
@ -114,6 +113,3 @@ checkDebugMode = go =<< getEnv "PROPELLOR_DEBUG"
updateGlobalLogger rootLoggerName $ updateGlobalLogger rootLoggerName $
setLevel DEBUG . setHandlers [f] setLevel DEBUG . setHandlers [f]
go _ = noop go _ = noop
propellorSigel :: String
propellorSigel = "* "