From bf45f22990ec306883d94485139e5137c2e2ec9b Mon Sep 17 00:00:00 2001 From: Matthias Fischmann Date: Fri, 22 Feb 2019 10:09:09 +0100 Subject: [PATCH] Revert "Add helper to canonicalize whitespace on a renderer." This reverts commit 381a474c26d95321feb108d0e02bab6969e942e8. --- src/System/Logger.hs | 1 - src/System/Logger/Settings.hs | 20 -------------------- 2 files changed, 21 deletions(-) diff --git a/src/System/Logger.hs b/src/System/Logger.hs index 764f736..0fd3fa0 100644 --- a/src/System/Logger.hs +++ b/src/System/Logger.hs @@ -26,7 +26,6 @@ module System.Logger , setRendererNetstr , renderDefault , renderNetstr - , canonicalizeWhitespace , bufSize , setBufSize , name diff --git a/src/System/Logger/Settings.hs b/src/System/Logger/Settings.hs index f5e39ed..ec89a5a 100644 --- a/src/System/Logger/Settings.hs +++ b/src/System/Logger/Settings.hs @@ -25,7 +25,6 @@ module System.Logger.Settings , setRendererNetstr , renderDefault , renderNetstr - , canonicalizeWhitespace , logLevel , logLevelMap , logLevelOf @@ -41,7 +40,6 @@ module System.Logger.Settings ) where import Data.String -import Data.Char (isSpace) import Data.ByteString (ByteString) import Data.ByteString.Char8 (pack) import Data.Map.Strict as Map @@ -50,7 +48,6 @@ import Data.UnixTime import System.Log.FastLogger (defaultBufSize) import System.Logger.Message -import qualified Data.ByteString.Lazy.Char8 as L import qualified Data.ByteString.Lazy.Builder as B data Settings = Settings @@ -117,23 +114,6 @@ renderDefault s _ _ = renderDefault_ s renderNetstr :: Renderer renderNetstr _ _ _ = renderNetstr_ --- | Replace all whitespace characters in the output of a renderer by @' '@. --- Log output must be ASCII encoding. --- --- (Many logging processors handle newlines poorly. Instead of hunting down all --- places and situations in your code and your dependencies that inject newlines --- into your log messages, you can choose to call 'canonicalizeWhitespace' on --- your renderer.) -canonicalizeWhitespace :: Renderer -> Renderer -canonicalizeWhitespace rndrRaw delim df lvl - = B.lazyByteString . nl2sp . B.toLazyByteString . rndrRaw delim df lvl - where - nl2sp :: L.ByteString -> L.ByteString - nl2sp = L.concatMap $ - \c -> if isSpace c - then " " - else L.singleton c - logLevel :: Settings -> Level logLevel = _logLevel -- GitLab