Unverified Commit 7c626f2b authored by Kim Altintop's avatar Kim Altintop
Browse files

Merge branch 'develop' into custom-format

parents 17f12e65 434aed67

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ cabal-dev 
*.aux*

*.ps*

*.hp*

Setup.hs

dist

tmp

log

.gitlab-ci.yml

+23 −15
Original line number Diff line number Diff line 
variables:

  STACK_ROOT: "${CI_PROJECT_DIR}/.stack"



cache:

  key: "$CI_JOB_NAME"

  paths:

    - .stack



before_script:

  - apt-get update

  - apt-get install -y libstdc++-4.9-dev g++

  - cabal update

  - apt -qq update

  - apt -qq install xz-utils make libstdc++-4.9-dev g++

  - stack upgrade && hash -d stack && stack --version

  - stack clean --full



test:8.4:

  image: haskell:8.2

  script:

    - stack -j 1 test --fast



test:7.10:

  image: haskell:7.10

test:8.2:

  image: haskell:8.2

  script:

    - cabal install --enable-test --enable-bench --only-dep -j

    - cabal build

    - cabal test

    - cabal bench

    - stack -j 1 --resolver lts-11.1 test --fast



test:7.8:

  image: haskell:7.8

test:8.0:

  image: haskell:8.0

  script:

    - cabal install --enable-test --enable-bench --only-dep -j

    - cabal build

    - cabal test

    - cabal bench
 
    - stack -j 1 --resolver lts-9.21 test --fast

CHANGELOG.md

+4 −0
Original line number Diff line number Diff line 
0.14.1

-----------------------------------------------------------------------------

- Maintenance release to enable compatibility with GHC 8.4.



0.14.0

-----------------------------------------------------------------------------

- `setFormat` now expects a `Maybe DateFormat` to allow for not having a date

Setup.hs

0 → 100644
+2 −0
Original line number Diff line number Diff line 
import Distribution.Simple

main = defaultMain

src/System/Logger/Message.hs

+27 −5
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
-- file, You can obtain one at http://mozilla.org/MPL/2.0/.



{-# LANGUAGE BangPatterns      #-}

{-# LANGUAGE CPP               #-}

{-# LANGUAGE OverloadedStrings #-}

{-# LANGUAGE FlexibleInstances #-}
@@ -35,10 +36,17 @@ module System.Logger.Message 
    , renderNetstr

    ) where



#if MIN_VERSION_base(4,9,0)

import Data.Semigroup as Sem

#endif



#if !(MIN_VERSION_base(4,8,0))

import Data.Monoid

#endif



import Data.ByteString (ByteString)

import Data.Double.Conversion.Text

import Data.Int

import Data.Monoid

import Data.String

import Data.Text (Text)

import Data.Text.Encoding (encodeUtf8)
@@ -55,13 +63,27 @@ import qualified Data.Text.Lazy.Encoding as TL 


data Builder = Builder !Int B.Builder



instance Monoid Builder where

    mempty = Builder 0 mempty

    (Builder x a) `mappend` (Builder y b) = Builder (x + y) (a <> b)



instance IsString Builder where

    fromString = bytes



appendBuilder:: Builder -> Builder -> Builder

appendBuilder (Builder x a) (Builder y b) = Builder (x + y) (a <> b)



#if MIN_VERSION_base(4,9,0)

instance Sem.Semigroup Builder where

    (<>) = appendBuilder

#endif



instance Monoid Builder where

    mempty = Builder 0 mempty

#if MIN_VERSION_base(4,11,0)

    -- mappend definitions are redundant now

#elif MIN_VERSION_base(4,9,0)

    mappend = (Sem.<>)

#else

    mappend = appendBuilder

#endif



eval :: Builder -> L.ByteString

eval (Builder n b) = B.toLazyByteStringWith (B.safeStrategy n 256) L.empty b