ridley 0.3.3.0 → 0.3.3.1

raw patch · 2 files changed

+17/−15 lines, 2 filesdep +http-typesdep +waidep +warpdep −Spockdep ~shellyPVP ok

version bump matches the API change (PVP)

Dependencies added: http-types, wai, warp

Dependencies removed: Spock

Dependency ranges changed: shelly

API changes (from Hackage documentation)

Files

• example/Main.hs +12/−12
• ridley.cabal +5/−3

@@ -6,27 +6,27 @@ import qualified System.Metrics.Prometheus.RegistryT as P import           System.Metrics.Prometheus.Ridley.Types import           Lens.Micro-import           Web.Spock-import           Web.Spock.Config import           Network.Wai.Metrics+import           Network.HTTP.Types (status200) import           Control.Exception import           Control.Monad.Trans import           Data.Time.Clock.POSIX import           Katip import           System.IO+import qualified Network.Wai as Wai+import qualified Network.Wai.Handler.Warp as Warp -spockWeb :: RidleyCtx -> IO ()-spockWeb ctx = do-  spockCfg <- defaultSpockCfg () PCNoDatabase ()-  runSpock 8080 (spock spockCfg (app ctx))+webApp :: RidleyCtx -> IO ()+webApp ctx = Warp.run 8080 (app ctx) -app :: RidleyCtx -> SpockCtxM ctx conn sess st ()+app :: RidleyCtx -> Wai.Application app ctx = do   case ctx ^. ridleyWaiMetrics of-    Nothing -> return ()-    Just m  -> middleware (metrics m)-  get root $ text "Hello World!"-  get "ping" $ text "pong"+    Nothing -> myApp+    Just m  -> (metrics m) myApp+  where+    myApp _rq respond =+      respond $ Wai.responseLBS status200 [] "Hello World"  customExpensiveMetric :: RidleyMetric customExpensiveMetric =@@ -66,4 +66,4 @@              & prometheusOptions . samplingFrequency .~ 5              & dataRetentionPeriod .~ Just 60              & katipScribes .~ ("RidleyTest", [("stdout", ridleyScribe)])-    startRidley opts ["metrics"] 8729 >>= spockWeb+    startRidley opts ["metrics"] 8729 >>= webApp

@@ -1,5 +1,5 @@ name:                ridley-version:             0.3.3.0+version:             0.3.3.1 synopsis:            Quick metrics to grow your app strong. description:         A collection of Prometheus metrics to monitor your app. Please see README.md homepage:            https://github.com/iconnect/ridley#README@@ -47,7 +47,7 @@                        time,                        text >= 1.2.4.0,                        mtl,-                       shelly,+                       shelly >= 1.8.2,                        safe-exceptions < 1.8,                        transformers,                        prometheus > 0.5.0 && < 2.3.0,@@ -102,8 +102,10 @@                    , ridley                    , katip                    , text+                   , http-types+                   , wai                    , wai-middleware-metrics-                   , Spock+                   , warp                    , microlens                    , mtl                    , prometheus