hriemann 0.2.2.2 → 0.3.0.0

raw patch · 3 files changed

+16/−6 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• hriemann.cabal +1/−1
• src/Network/Monitoring/Riemann/Event.hs +0/−1
• src/Network/Monitoring/Riemann/Json.hs +15/−4

@@ -1,5 +1,5 @@ name:                hriemann-version:             0.2.2.2+version:             0.3.0.0 synopsis:            Initial project template from stack description:         A Riemann Client for Haskell homepage:            https://github.com/shmish111/hriemann

@@ -28,7 +28,6 @@ import           Data.Sequence import           Data.Time.Clock.POSIX import           Network.HostName-import           Network.Monitoring.Riemann.Json            () import qualified Network.Monitoring.Riemann.Proto.Attribute as Attribute import qualified Network.Monitoring.Riemann.Proto.Event     as E import           Text.ProtocolBuffers.Basic                 as Basic

@@ -5,7 +5,6 @@ {-# OPTIONS_GHC  -fno-warn-orphans #-} module Network.Monitoring.Riemann.Json where -import           Control.Applicative                        ((<|>)) import           Data.Aeson                                 (FromJSON, ToJSON,                                                              Value (String),                                                              parseJSON, toJSON,@@ -45,9 +44,21 @@     mMetric_d <- v .:? "metric_d"     mMetric_f <- v .:? "metric_f"     mMetric <- v .:? "metric"-    let metric_sint64 = mMetric_sint64 <|> (toBoundedInteger =<< mMetric)-        metric_d = mMetric_d <|> (rightToJust . toBoundedRealFloat =<< mMetric)-        metric_f = mMetric_f <|> (rightToJust . toBoundedRealFloat =<< mMetric)+    let metric_sint64 = case mMetric_sint64 of+          Nothing -> do+            s <- mMetric+            toBoundedInteger s+          i -> i+    let metric_d = case mMetric_d of+          Nothing -> do+            s <- mMetric+            rightToJust $ toBoundedRealFloat s+          d -> d+    let metric_f = case mMetric_f of+          Nothing -> do+            s <- mMetric+            rightToJust $ toBoundedRealFloat s+          d -> d     pure Event { .. }  rightToJust :: Either l r -> Maybe r