ridley 0.3.1.2 → 0.3.1.3

raw patch · 2 files changed

+12/−4 lines, 2 filesdep ~containersdep ~katipnew-uploaderPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: containers, katip

API changes (from Hackage documentation)

Files

• ridley.cabal +4/−4
• src/System/Metrics/Prometheus/Ridley.hs +8/−0

@@ -1,12 +1,12 @@ name:                ridley-version:             0.3.1.2+version:             0.3.1.3 synopsis:            Quick metrics to grow your app strong. description:         Please see README.md homepage:            https://github.com/iconnect/ridley#README license:             BSD3 license-file:        LICENSE author:              Alfredo Di Napoli & the IRIS Connect Engineering Team-maintainer:          alfredo@irisconnect.co.uk+maintainer:          chrisd@irisconnect.co.uk copyright:           2017 IRIS Connect Ltd. category:            Web build-type:          Simple@@ -32,8 +32,8 @@    build-depends:       async < 3.0.0,                        base >= 4.7 && < 5,-                       containers < 0.6.0.0,-                       katip < 0.4.0.0,+                       containers < 0.7.0.0,+                       katip < 0.8.0.0,                        wai-middleware-metrics < 0.3.0.0,                        template-haskell,                        ekg-core,

@@ -42,7 +42,11 @@ import           Lens.Micro import           Network.Wai.Metrics (registerWaiMetrics) import           System.Metrics as EKG+#if (MIN_VERSION_prometheus(0,5,0))+import qualified System.Metrics.Prometheus.Http.Scrape as P+#else import qualified System.Metrics.Prometheus.Concurrent.Http as P+#endif import           System.Metrics.Prometheus.Metric.Counter (add) import qualified System.Metrics.Prometheus.RegistryT as P import           System.Metrics.Prometheus.Ridley.Metrics.CPU@@ -134,7 +138,11 @@       le <- initLogEnv (opts ^. katipScribes . _1) "production"        -- Register all the externally-passed Katip's Scribe+#if (MIN_VERSION_katip(0,5,0))+      le' <- foldM (\le0 (n,s) -> registerScribe n s defaultScribeSettings le0) le (opts ^. katipScribes . _2)+#else       let le' = List.foldl' (\le0 (n,s) -> registerScribe n s le0) le (opts ^. katipScribes . _2)+#endif        -- Start the server       serverLoop <- async $ runRidley opts le' $ do