diff --git a/src/Vervis/Application.hs b/src/Vervis/Application.hs index 0da8805..830671b 100644 --- a/src/Vervis/Application.hs +++ b/src/Vervis/Application.hs @@ -89,7 +89,7 @@ makeFoundation :: AppSettings -> IO App makeFoundation appSettings = do -- Some basic initializations: HTTP connection manager, logger, and static -- subsite. - appHttpManager <- newManager + --appHttpManager <- newManager tlsManagerSettings appLogger <- newStdoutLoggerSet defaultBufSize >>= makeYesodLogger appStatic <- (if appMutableStatic appSettings then staticDevel else static) diff --git a/src/Vervis/Foundation.hs b/src/Vervis/Foundation.hs index ab75686..190fb9f 100644 --- a/src/Vervis/Foundation.hs +++ b/src/Vervis/Foundation.hs @@ -59,7 +59,7 @@ data App = App { appSettings :: AppSettings , appStatic :: Static -- ^ Settings for static file serving. , appConnPool :: ConnectionPool -- ^ Database connection pool. - , appHttpManager :: Manager + --, appHttpManager :: Manager , appLogger :: Logger , appMailQueue :: Maybe (Chan (MailRecipe App)) , appSvgFont :: PreparedFont Double @@ -443,7 +443,7 @@ instance YesodAuth App where -- You can add other plugins like BrowserID, email or OAuth here authPlugins _ = [accountPlugin] - authHttpManager = getsYesod getHttpManager + authHttpManager = error "authHttpManager" onLogout = clearUnverifiedCreds False @@ -529,8 +529,8 @@ instance RenderMessage App FormMessage where -- An example is background jobs that send email. -- This can also be useful for writing code that works across multiple Yesod -- applications. -instance HasHttpManager App where - getHttpManager = appHttpManager +--instance HasHttpManager App where +-- getHttpManager = appHttpManager unsafeHandler :: App -> Handler a -> IO a unsafeHandler = Unsafe.fakeHandlerGetLogger appLogger diff --git a/src/Vervis/Import/NoFoundation.hs b/src/Vervis/Import/NoFoundation.hs index 9fe4a48..f8b13f8 100644 --- a/src/Vervis/Import/NoFoundation.hs +++ b/src/Vervis/Import/NoFoundation.hs @@ -21,7 +21,7 @@ import Database.Persist.Sql as Import ( SqlBackend , SqlPersistT , runMigration ) -import Network.HTTP.Client.Conduit as Import +--import Network.HTTP.Client.Conduit as Import import Network.HTTP.Types as Import import Yesod as Import hiding (Header, parseTime) import Yesod.Auth as Import diff --git a/vervis.cabal b/vervis.cabal index 61430ac..cf4193c 100644 --- a/vervis.cabal +++ b/vervis.cabal @@ -263,7 +263,6 @@ library --, hjsmin -- 'git' uses it for 'GitTime' , hourglass - , http-conduit , http-types , libravatar -- for converting Darcs patch hash Digest to ByteString