Unverified Commit bf45f229 authored by Matthias Fischmann's avatar Matthias Fischmann
Browse files

Revert "Add helper to canonicalize whitespace on a renderer."

This reverts commit 381a474c.
parent 381a474c
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ module System.Logger
    , setRendererNetstr
    , renderDefault
    , renderNetstr
    , canonicalizeWhitespace
    , bufSize
    , setBufSize
    , name
+0 −20
Original line number Diff line number Diff line
@@ -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