From f91b27cf8dce8a92c0b296209323a79cc1e36873 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 27 Jan 2019 18:54:07 +0100 Subject: Reaktor: use forM_ like whenJust --- src/Reaktor.hs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/Reaktor.hs b/src/Reaktor.hs index 34baadb..042fcfe 100644 --- a/src/Reaktor.hs +++ b/src/Reaktor.hs @@ -10,6 +10,7 @@ module Reaktor import Blessings.Text import Control.Concurrent.Extended import Control.Exception +import Control.Monad (forM_) import Data.Attoparsec.Text (feed,parse) import Data.Attoparsec.Text (IResult(Done,Fail,Partial)) import Data.ByteString (ByteString) @@ -71,11 +72,9 @@ run Config{..} getPlugins = aSend msg = logMsg msg >> putOutMsg msg logMsg msg = - case logMsgFilter msg of - Just msg' -> do - let bs = formatMessage msg' - aLog $ SGR [38,5,235] "> " <> SGR [35,1] (Plain bs) - Nothing -> return () + forM_ (logMsgFilter msg) $ \msg' -> do + let bs = formatMessage msg' + aLog $ SGR [38,5,235] "> " <> SGR [35,1] (Plain bs) mapM_ (\(s, f) -> installHandler s (Catch f) Nothing) [ (sigINT, shutdown) @@ -143,11 +142,9 @@ receiver Actions{..} putInMsg sockRecv = logErr s = aLog $ SGR [31,1] ("! receive: " <> s) logMsg msg = - case logMsgFilter msg of - Just msg' -> do - let bs = formatMessage msg' - aLog $ SGR [38,5,235] "< " <> SGR [38,5,244] (Plain bs) - Nothing -> return () + forM_ (logMsgFilter msg) $ \msg' -> do + let bs = formatMessage msg' + aLog $ SGR [38,5,235] "< " <> SGR [38,5,244] (Plain bs) sender :: IO Message -> (ByteString -> IO ()) -> IO () -- cgit v1.2.3