Blammo-wai 0.0.0.2 → 0.0.0.3
raw patch · 5 files changed
+19/−15 lines, 5 filesdep −markdown-unlitdep ~BlammoPVP ok
version bump matches the API change (PVP)
Dependencies removed: markdown-unlit
Dependency ranges changed: Blammo
API changes (from Hackage documentation)
Files
- Blammo-wai.cabal +7/−5
- CHANGELOG.md +5/−1
- README.lhs +0/−1
- README.md +0/−1
- src/Network/Wai/Middleware/Logging.hs +7/−7
Blammo-wai.cabal view
@@ -1,10 +1,12 @@ cabal-version: 1.18 name: Blammo-wai-version: 0.0.0.2+version: 0.0.0.3 license: MIT license-file: LICENSE maintainer: Freckle Education-homepage: https://github.com/freckle/blammo#readme+homepage:+ https://github.com/freckle/blammo/tree/main/Blammo-wai#readme+ bug-reports: https://github.com/freckle/blammo/issues synopsis: Using Blammo with WAI description: Please see README.md@@ -35,7 +37,7 @@ -Wno-safe -Wno-unsafe build-depends:- Blammo >=2.1.0.0,+ Blammo >=2.1.4.1, aeson >=1.5.2.0, base >=4.13.0.0 && <5, bytestring >=0.10.10.1,@@ -60,6 +62,7 @@ test-suite readme type: exitcode-stdio-1.0 main-is: README.lhs+ build-tool-depends: markdown-unlit:markdown-unlit other-modules: Paths_Blammo_wai default-language: Haskell2010 default-extensions:@@ -74,12 +77,11 @@ -Wno-safe -Wno-unsafe -pgmL markdown-unlit build-depends:- Blammo >=2.1.0.0,+ Blammo >=2.1.4.1, Blammo-wai, aeson >=1.5.2.0, base >=4.13.0.0 && <5, lens >=4.18.1,- markdown-unlit >=0.5.1, text >=1.2.4.0, wai >=3.2.2.1, warp >=3.3.13,
CHANGELOG.md view
@@ -1,4 +1,8 @@-## [_Unreleased_](https://github.com/freckle/blammo/compare/Blammo-wai-v0.0.0.2..main)+## [_Unreleased_](https://github.com/freckle/blammo/compare/Blammo-wai-v0.0.0.3..main)++## [v0.0.0.3](https://github.com/freckle/blammo/compare/Blammo-wai-v0.0.0.2...Blammo-wai-v0.0.0.3)++- Fix `homepage` ## [v0.0.0.2](https://github.com/freckle/blammo/compare/Blammo-wai-v0.0.0.1...Blammo-wai-v0.0.0.2)
README.lhs view
@@ -20,7 +20,6 @@ import Control.Monad (when) import Data.Aeson import Data.Text (Text)-import Text.Markdown.Unlit () import Control.Lens (lens) ``` -->
README.md view
@@ -20,7 +20,6 @@ import Control.Monad (when) import Data.Aeson import Data.Text (Text)-import Text.Markdown.Unlit () import Control.Lens (lens) ``` -->
src/Network/Wai/Middleware/Logging.hs view
@@ -103,8 +103,8 @@ Config { cLogSource = "requestLogger" , cGetClientIp = \req ->- fromMaybe (pack $ show $ remoteHost req) $- (firstValue =<< lookupRequestHeader "x-forwarded-for" req)+ fromMaybe (pack $ show $ remoteHost req)+ $ (firstValue =<< lookupRequestHeader "x-forwarded-for" req) <|> lookupRequestHeader "x-real-ip" req , cGetDestinationIp = lookupRequestHeader "x-real-ip" }@@ -147,11 +147,11 @@ app req $ \resp -> do recvd <- respond resp duration <- toMillis . subtract begin <$> getTime- runInIO $- runWithLogger env $- if isRaw resp- then logRawResponse config duration req- else logResponse config duration req resp+ runInIO+ $ runWithLogger env+ $ if isRaw resp+ then logRawResponse config duration req+ else logResponse config duration req resp pure recvd where getTime = Clock.getTime Clock.Monotonic