Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX

This commit is contained in:
SJost 2019-02-22 10:50:44 +01:00
commit 1c99c11fbb

View File

@ -78,6 +78,8 @@ import qualified Crypto.Saltine.Core.SecretBox as SecretBox
import qualified Database.Memcached.Binary.IO as Memcached
import Data.Bits (Bits(zeroBits))
import Network.Wai.Parse (lbsBackEnd)
instance DisplayAble b => DisplayAble (E.CryptoID a b) where
display = display . ciphertext
@ -891,6 +893,8 @@ instance Yesod UniWorX where
. runIdentity
$ sourceList (Lazy.ByteString.toChunks content) $$ sinkHash
fileUpload _site _length = FileUploadMemory lbsBackEnd
-- What messages should be logged. The following includes all messages when
-- in development, and warnings and errors in production.
shouldLog _ _ _ = error "Must use shouldLogIO"