This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "snap-server".
The branch, master has been updated
via 78ac4fbfe0611f31fc6524b535fc4848f9218386 (commit)
from 7135e45003e17b8f5b52e25e44c25a0afa87dd69 (commit)
Summary of changes:
snap-server.cabal | 2 +-
src/Snap/Internal/Http/Server.hs | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 78ac4fbfe0611f31fc6524b535fc4848f9218386
Author: Gregory Collins <[email protected]>
Date: Thu May 27 20:07:43 2010 -0400
Improve error log formatting, upgrade attoparsec-iteratee
diff --git a/snap-server.cabal b/snap-server.cabal
index 0efd488..4e5d1aa 100644
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@ -90,7 +90,7 @@ Library
build-depends:
array >= 0.2 && <0.4,
attoparsec >= 0.8.0.2 && < 0.9,
- attoparsec-iteratee >= 0.1 && <0.2,
+ attoparsec-iteratee >= 0.1.1 && <0.2,
base >= 4 && < 5,
bytestring,
bytestring-nums,
diff --git a/src/Snap/Internal/Http/Server.hs b/src/Snap/Internal/Http/Server.hs
index 47c7eca..beeb2fc 100644
--- a/src/Snap/Internal/Http/Server.hs
+++ b/src/Snap/Internal/Http/Server.hs
@@ -262,10 +262,11 @@ runHTTP lh lip lp rip rp alog elog
, Handler $ \(_ :: Backend.TimeoutException) -> return ()
, Handler $ \(e :: SomeException) ->
- logE elog $ S.concat [ "Server.runHTTP.go: got
someexception: "
- , bshow e ] ]
+ logE elog $ S.concat [ logPrefix , bshow e ] ]
where
+ logPrefix = S.concat [ "[", rip, "]: error: " ]
+
go = do
let iter = runServerMonad lh lip lp rip rp (logA alog) (logE elog) $
httpSession writeEnd onSendFile tickle
-----------------------------------------------------------------------
hooks/post-receive
--
snap-server
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
