Skip to content

Commit

Permalink
GHC 7.10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
mvoidex committed Mar 28, 2015
1 parent 59ed378 commit a397247
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 18 deletions.
17 changes: 8 additions & 9 deletions simple-log.cabal
@@ -1,5 +1,5 @@
Name: simple-log
Version: 0.3.1
Version: 0.3.2
Synopsis: Simple log for Haskell
Description: Log library for Haskell with removing unnecessary traces
License: BSD3
Expand All @@ -16,17 +16,16 @@ Library
HS-Source-Dirs: src
Build-Depends:
base >= 4.0 && < 6,
containers >= 0.3 && < 0.6,
deepseq >= 1.3 && < 1.4,
directory >= 1.1 && < 1.3,
filepath >= 1.0 && < 1.4,
containers >= 0.5 && < 0.6,
deepseq >= 1.4 && < 1.5,
directory >= 1.2 && < 1.3,
filepath >= 1.4 && < 1.5,
MonadCatchIO-transformers >= 0.2 && < 0.4,
mtl >= 2.0 && < 2.2,
old-locale >= 1.0 && < 1.1,
mtl >= 2.2 && < 2.3,
SafeSemaphore >= 0.9.0 && < 1.0.0,
text >= 0.11.0 && < 2.0.0,
time >= 1.3 && < 1.5,
transformers >= 0.2 && < 0.4
time >= 1.5 && < 1.6,
transformers >= 0.4 && < 0.5
Exposed-Modules:
System.Log.Simple
System.Log.Simple.Base
Expand Down
5 changes: 2 additions & 3 deletions src/System/Log/Simple/Config.hs
@@ -1,16 +1,15 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE OverloadedStrings, FlexibleContexts #-}

module System.Log.Simple.Config (
parseRule, parseRules,
parseRule_, parseRules_,
constant, mvar, fileCfg
) where

import Control.Applicative
import Control.Arrow
import Control.Concurrent
import Control.Exception
import Control.Monad.Error
import Control.Monad.Except
import Control.Monad.Writer
import Data.Either
import Data.Text (Text)
Expand Down
10 changes: 5 additions & 5 deletions src/System/Log/Simple/Monad.hs
Expand Up @@ -22,7 +22,7 @@ import Control.Exception (SomeException)
import Control.Concurrent.MSem
import Control.Monad.IO.Class
import Control.Monad.Reader
import Control.Monad.Error
import Control.Monad.Except
import Control.Monad.CatchIO as C
import Data.String
import Data.Text (Text)
Expand Down Expand Up @@ -77,7 +77,7 @@ scopeM_ s act = do

-- | Scope with log exceptions from 'MonadError'
-- | Workaround: we must explicitely post 'LeaveScope'
scopeM :: (Error e, Show e, MonadLog m, MonadError e m) => Text -> m a -> m a
scopeM :: (Show e, MonadLog m, MonadError e m) => Text -> m a -> m a
scopeM s act = scopeM_ s $ C.catch act' onError' where
onError' :: (MonadLog m) => SomeException -> m a
onError' e = logE e >> throw e
Expand All @@ -94,7 +94,7 @@ scoper s act = do
log Trace $ T.concat ["Scope ", s, " leaves with result: ", fromString . show $ r]
return r

scoperM :: (Error e, Show e, Show a, MonadLog m, MonadError e m) => Text -> m a -> m a
scoperM :: (Show e, Show a, MonadLog m, MonadError e m) => Text -> m a -> m a
scoperM s act = do
r <- scopeM s act
log Trace $ T.concat ["Scope", s, " leaves with result: ", fromString . show $ r]
Expand All @@ -107,9 +107,9 @@ ignoreError act = C.catch act onError where
onError _ = return ()

-- | Ignore MonadError error
ignoreErrorM :: (Error e, MonadLog m, MonadError e m) => m () -> m ()
ignoreErrorM :: (MonadLog m, MonadError e m) => m () -> m ()
ignoreErrorM act = catchError act onError where
onError :: (Error e, MonadLog m, MonadError e m) => e -> m ()
onError :: (MonadLog m, MonadError e m) => e -> m ()
onError _ = return ()

-- | Trace value
Expand Down
1 change: 0 additions & 1 deletion src/System/Log/Simple/Text.hs
Expand Up @@ -6,7 +6,6 @@ module System.Log.Simple.Text (
import Data.Text (Text)
import qualified Data.Text as T
import Data.Time
import System.Locale
import System.Log.Simple.Base

-- | Default time format
Expand Down

0 comments on commit a397247

Please sign in to comment.