ekg-wai 0.1.1.0 → 0.1.2.0

raw patch · 3 files changed

+21/−13 lines, 3 filesdep ~filepathdep ~timePVP ok

version bump matches the API change (PVP)

Dependency ranges changed: filepath, time

API changes (from Hackage documentation)

Files

• README.md +2/−1
• System/Remote/Monitoring/Wai.hs +9/−2
• ekg-wai.cabal +10/−10

@@ -1,4 +1,5 @@ # EKG: Remote monitoring of running processes over HTTP+[![Build status](https://github.com/tvh/ekg-wai/actions/workflows/ci.yml/badge.svg)](https://github.com/tvh/ekg-wai/actions/workflows/ci.yml)  This library lets you remotely monitor a running process over HTTP. It provides a simple way to integrate a monitoring server into any@@ -54,5 +55,5 @@  # Authors -This library is maintained by Timo von Holtz, <tvh@tvholtz.de>.+This library is maintained by Timo von Holtz, <tvh@tvholtz.net>. It was originally written using Snap by Johan Tibell, <johan.tibell@gmail.com>.

@@ -45,6 +45,7 @@     ) where  import Control.Concurrent (ThreadId, myThreadId, throwTo)+import Control.Exception (AsyncException(ThreadKilled), fromException) import Data.Int (Int64) import Data.Time.Clock.POSIX (getPOSIXTime) import Prelude hiding (read)@@ -60,6 +61,7 @@ import Network.Socket (withSocketsDo)  import Control.Concurrent (forkFinally)+import GHC.Conc (labelThread)  -- $configuration --@@ -228,10 +230,15 @@ forkServerWith store host port = do     Metrics.registerCounter "ekg.server_timestamp_ms" getTimeMs store     me <- myThreadId-    tid <- withSocketsDo $ forkFinally (startServer store host port) $ \ r ->+    tid <- withSocketsDo $ forkFinally (do+      myThreadId >>= flip labelThread "Warp server (ekg-wai)"+      startServer store host port+     ) $ \ r ->         case r of-            Left e  -> throwTo me e             Right _ -> return ()+            Left e  -> case fromException e of+                Just ThreadKilled -> return ()+                _                 -> throwTo me e     return $! Server tid store   where     getTimeMs :: IO Int64

@@ -1,5 +1,5 @@ name:                ekg-wai-version:             0.1.1.0+version:             0.1.2.0 synopsis:            Remote monitoring of processes description:   This library lets you remotely monitor a running process over HTTP.@@ -12,7 +12,7 @@ license:             BSD3 license-file:        LICENSE author:              Timo von Holtz, Johan Tibell-maintainer:          tvh@tvholtz.de+maintainer:          tvh@tvholtz.net category:            System, Network build-type:          Simple data-files:          assets/index.html assets/monitor.js assets/monitor.css@@ -24,12 +24,12 @@                      assets/bootstrap-1.4.0.css                      examples/Basic.hs cabal-version:       >= 1.10-tested-with:         GHC == 7.10.3-                   , GHC == 8.0.2-                   , GHC == 8.2.2-                   , GHC == 8.4.1-                   , GHC == 8.8.3-+tested-with:         GHC == 9.0.2+                   , GHC == 9.2.8+                   , GHC == 9.4.8+                   , GHC == 9.6.6+                   , GHC == 9.8.4+                   , GHC == 9.10.1 library   exposed-modules:     System.Remote.Monitoring.Wai@@ -45,11 +45,11 @@     bytestring < 1.0,     ekg-core >= 0.1 && < 0.2,     ekg-json >= 0.1 && < 0.2,-    filepath < 1.5,+    filepath < 1.6,     http-types,     network,     text,-    time < 1.10,+    time < 1.15,     transformers,     unordered-containers,     wai,