Merge pull request #11 from koterpillar/json-exception

Handle JSON exceptions
koterpillar · Aug 15, 2017 · 7c068b9 · 7c068b9
2 parents 4a4387b + 3747c47
commit 7c068b9
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Fetcher/Base.hs b/src/Fetcher/Base.hs
@@ -5,6 +5,7 @@ import Control.Applicative
 import Control.Exception.Lifted
 
 import Network.HTTP.Client (HttpException)
+import Network.HTTP.Simple (JSONException)
 
 import Types.Config
 
@@ -19,8 +20,11 @@ logIOError context err = logErrorStr context (show err)
 logHttpError :: (Alternative m, Show c) => c -> HttpException -> AppM (m a)
 logHttpError context err = logErrorStr context (show err)
 
+logJSONError :: (Alternative m, Show c) => c -> JSONException -> AppM (m a)
+logJSONError context err = logErrorStr context (show err)
+
 logErrors :: (Alternative m, Show c) => c -> AppM (m a) -> AppM (m a)
-logErrors context = handle (logIOError context) . handle (logHttpError context)
+logErrors context = handle (logIOError context) . handle (logHttpError context) . handle (logJSONError context)
 
 logEither :: Alternative m => Either String a -> (a -> AppM (m b)) -> AppM (m b)
 logEither (Left err) _ = logStr err >> return empty