Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-wai-logger for openSUSE:Factory checked in at 2022-02-11 23:09:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-wai-logger (Old) and /work/SRC/openSUSE:Factory/.ghc-wai-logger.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-wai-logger" Fri Feb 11 23:09:59 2022 rev:4 rq:953561 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-wai-logger/ghc-wai-logger.changes 2020-12-22 11:48:57.169983191 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-wai-logger.new.1956/ghc-wai-logger.changes 2022-02-11 23:12:00.419396729 +0100 @@ -1,0 +2,6 @@ +Sun Jan 30 00:52:35 UTC 2022 - Peter Simons <[email protected]> + +- Update wai-logger to version 2.4.0. + Upstream does not provide a change log file. + +------------------------------------------------------------------- Old: ---- wai-logger-2.3.6.tar.gz New: ---- wai-logger-2.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-wai-logger.spec ++++++ --- /var/tmp/diff_new_pack.LVY7VM/_old 2022-02-11 23:12:00.827397909 +0100 +++ /var/tmp/diff_new_pack.LVY7VM/_new 2022-02-11 23:12:00.831397921 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-wai-logger # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name wai-logger %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.3.6 +Version: 2.4.0 Release: 0 Summary: A logging system for WAI License: MIT ++++++ wai-logger-2.3.6.tar.gz -> wai-logger-2.4.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-logger-2.3.6/Network/Wai/Logger/Apache.hs new/wai-logger-2.4.0/Network/Wai/Logger/Apache.hs --- old/wai-logger-2.3.6/Network/Wai/Logger/Apache.hs 2019-10-04 03:06:26.000000000 +0200 +++ new/wai-logger-2.4.0/Network/Wai/Logger/Apache.hs 2001-09-09 03:46:40.000000000 +0200 @@ -41,10 +41,12 @@ | FromFallback -- | Apache style log format. -apacheLogStr :: IPAddrSource -> FormattedTime -> Request -> Status -> Maybe Integer -> LogStr -apacheLogStr ipsrc tmstr req status msize = +apacheLogStr :: ToLogStr user => IPAddrSource -> (Request -> Maybe user) -> FormattedTime -> Request -> Status -> Maybe Integer -> LogStr +apacheLogStr ipsrc userget tmstr req status msize = toLogStr (getSourceIP ipsrc req) - <> " - - [" + <> " - " + <> maybe "-" toLogStr (userget req) + <> " [" <> toLogStr tmstr <> "] \"" <> toLogStr (requestMethod req) @@ -75,10 +77,12 @@ #endif -- | HTTP/2 Push log format in the Apache style. -serverpushLogStr :: IPAddrSource -> FormattedTime -> Request -> ByteString -> Integer -> LogStr -serverpushLogStr ipsrc tmstr req path size = +serverpushLogStr :: ToLogStr user => IPAddrSource -> (Request -> Maybe user) -> FormattedTime -> Request -> ByteString -> Integer -> LogStr +serverpushLogStr ipsrc userget tmstr req path size = toLogStr (getSourceIP ipsrc req) - <> " - - [" + <> " - " + <> maybe "-" toLogStr (userget req) + <> " [" <> toLogStr tmstr <> "] \"PUSH " <> toLogStr path @@ -119,11 +123,11 @@ -- >>> getSourceFromHeader defaultRequest { requestHeaders = [ ("X-Forwarded-For", "127.0.0.1") ] } -- "127.0.0.1" -- >>> getSourceFromHeader defaultRequest { requestHeaders = [ ("Something", "127.0.0.1") ] } --- "" +-- "-" -- >>> getSourceFromHeader defaultRequest { requestHeaders = [] } --- "" +-- "-" getSourceFromHeader :: Request -> ByteString -getSourceFromHeader = fromMaybe "" . getSource +getSourceFromHeader = fromMaybe "-" . getSource -- | -- >>> getSourceFromFallback defaultRequest { requestHeaders = [ ("X-Real-IP", "127.0.0.1") ] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-logger-2.3.6/Network/Wai/Logger/IP.hs new/wai-logger-2.4.0/Network/Wai/Logger/IP.hs --- old/wai-logger-2.3.6/Network/Wai/Logger/IP.hs 2019-10-04 03:06:26.000000000 +0200 +++ new/wai-logger-2.4.0/Network/Wai/Logger/IP.hs 2001-09-09 03:46:40.000000000 +0200 @@ -46,4 +46,4 @@ showSockAddr (SockAddrInet6 _ _ (0,0,0x0000ffff,addr4) _) = showIPv4 addr4 False showSockAddr (SockAddrInet6 _ _ (0,0,0,1) _) = "::1" showSockAddr (SockAddrInet6 _ _ addr6 _) = showIPv6 addr6 -showSockAddr _ = "unknownSocket" +showSockAddr (SockAddrUnix _) = "-" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-logger-2.3.6/Network/Wai/Logger.hs new/wai-logger-2.4.0/Network/Wai/Logger.hs --- old/wai-logger-2.3.6/Network/Wai/Logger.hs 2019-10-04 03:06:26.000000000 +0200 +++ new/wai-logger-2.4.0/Network/Wai/Logger.hs 2001-09-09 03:46:40.000000000 +0200 @@ -42,6 +42,7 @@ , serverpushLogger , logRotator , logRemover + , initLoggerUser , initLogger -- * Types , IPAddrSource(..) @@ -112,17 +113,24 @@ ---------------------------------------------------------------- -- | Creating 'ApacheLogger' according to 'LogType'. -initLogger :: IPAddrSource -> LogType -> IO FormattedTime - -> IO ApacheLoggerActions -initLogger ipsrc typ tgetter = do +initLoggerUser :: ToLogStr user => Maybe (Request -> Maybe user) -> IPAddrSource -> LogType -> IO FormattedTime + -> IO ApacheLoggerActions +initLoggerUser ugetter ipsrc typ tgetter = do (fl, cleanUp) <- newFastLogger typ return $ ApacheLoggerActions { - apacheLogger = apache fl ipsrc tgetter - , serverpushLogger = serverpush fl ipsrc tgetter + apacheLogger = apache fl ipsrc ugetter tgetter + , serverpushLogger = serverpush fl ipsrc ugetter tgetter , logRotator = return () , logRemover = cleanUp } +initLogger :: IPAddrSource -> LogType -> IO FormattedTime + -> IO ApacheLoggerActions +initLogger = initLoggerUser nouser + where + nouser :: Maybe (Request -> Maybe ByteString) + nouser = Nothing + --- | Checking if a log file can be written if 'LogType' is 'LogFileNoRotate' or 'LogFile'. logCheck :: LogType -> IO () logCheck LogNone = return () @@ -135,15 +143,15 @@ ---------------------------------------------------------------- -apache :: (LogStr -> IO ()) -> IPAddrSource -> IO FormattedTime -> ApacheLogger -apache cb ipsrc dateget req st mlen = do +apache :: ToLogStr user => (LogStr -> IO ()) -> IPAddrSource -> Maybe (Request -> Maybe user) -> IO FormattedTime -> ApacheLogger +apache cb ipsrc userget dateget req st mlen = do zdata <- dateget - cb (apacheLogStr ipsrc zdata req st mlen) + cb (apacheLogStr ipsrc (justGetUser userget) zdata req st mlen) -serverpush :: (LogStr -> IO ()) -> IPAddrSource -> IO FormattedTime -> ServerPushLogger -serverpush cb ipsrc dateget req path size = do +serverpush :: ToLogStr user => (LogStr -> IO ()) -> IPAddrSource -> Maybe (Request -> Maybe user) -> IO FormattedTime -> ServerPushLogger +serverpush cb ipsrc userget dateget req path size = do zdata <- dateget - cb (serverpushLogStr ipsrc zdata req path size) + cb (serverpushLogStr ipsrc (justGetUser userget) zdata req path size) --------------------------------------------------------------- @@ -167,3 +175,7 @@ clockDateCacher = do tgetter <- newTimeCache simpleTimeFormat return (tgetter, return ()) + +justGetUser :: Maybe (Request -> Maybe user) -> (Request -> Maybe user) +justGetUser (Just getter) = getter +justGetUser Nothing = \_ -> Nothing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-logger-2.3.6/wai-logger.cabal new/wai-logger-2.4.0/wai-logger.cabal --- old/wai-logger-2.3.6/wai-logger.cabal 2019-10-04 03:06:26.000000000 +0200 +++ new/wai-logger-2.4.0/wai-logger.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ Name: wai-logger -Version: 2.3.6 +Version: 2.4.0 Author: Kazu Yamamoto <[email protected]> Maintainer: Kazu Yamamoto <[email protected]> License: BSD3
