scion-browser 0.2.13 → 0.2.14

raw patch · 4 files changed

+14/−9 lines, 4 filesdep +monad-logger

Dependencies added: monad-logger

Files

• scion-browser.cabal +5/−3
• src/Scion/PersistentBrowser/Build.hs +3/−2
• src/Scion/PersistentBrowser/DbTypes.hs +2/−1
• src/Server/PersistentCommands.hs +4/−3

@@ -1,5 +1,5 @@ name:           scion-browser
-version:        0.2.13
+version:        0.2.14
 cabal-version:  >= 1.8
 build-type:     Simple
 license:        BSD3
@@ -41,7 +41,8 @@     transformers,
     unordered-containers >= 0.1.3,
     zlib,
-    ghc-paths == 0.1.*
+    ghc-paths == 0.1.*,
+    monad-logger >= 0.2.2
   
   if !os(mingw32)
     build-depends:
@@ -120,7 +121,8 @@     transformers,
     unordered-containers >= 0.1.3,
     zlib,
-    ghc-paths == 0.1.*
+    ghc-paths == 0.1.*,
+    monad-logger >= 0.2.2
   
   if !os(mingw32)
     build-depends:

@@ -33,6 +33,7 @@ import Text.ParserCombinators.ReadP
 import Control.Monad (when)
 import Data.Conduit (runResourceT)
+import Control.Monad.Logger (runStderrLoggingT)
 
 baseDbUrl :: String
 baseDbUrl = "http://haskell.org/hoogle/base.txt"
@@ -66,7 +67,7 @@ 
 saveHackageDatabaseWithTmp :: FilePath -> FilePath -> IO ()
 saveHackageDatabaseWithTmp file tmp = do (db, _) <- createHackageDatabase tmp
-                                         runResourceT $ withSqliteConn (T.pack file) (runSqlConn (mapM_ savePackageToDb db))
+                                         runResourceT $ runStderrLoggingT $ withSqliteConn (T.pack file) (runSqlConn (mapM_ savePackageToDb db))
                                          --mapM_ (\pkg -> withSqliteConn (T.pack file) (runSqlConn (savePackageToDb pkg))) db
 
 -- | Downloads the information for the entire Hackage database
@@ -105,7 +106,7 @@ 
 -- | Updates a database with changes in the installed package base.
 updateDatabase :: FilePath -> [InstalledPackageInfo] -> IO ()
-updateDatabase file pkgInfo = runResourceT $ withSqliteConn (T.pack file) $ runSqlConn $ updateDatabase' pkgInfo
+updateDatabase file pkgInfo = runResourceT $ runStderrLoggingT $ withSqliteConn (T.pack file) $ runSqlConn $ updateDatabase' pkgInfo
 
 updateDatabase' :: [InstalledPackageInfo] -> SQL ()
 updateDatabase' pkgInfo = 

@@ -7,8 +7,9 @@ import Database.Persist.Sqlite
 import Database.Persist.TH
 import Data.Conduit (ResourceT)
+import Control.Monad.Logger (LoggingT(..))
 
-type SQL a= SqlPersist (ResourceT IO) a
+type SQL a= SqlPersist (LoggingT (ResourceT IO)) a
 
 data DbDeclType = DbData | DbNewType | DbClass | DbInstance | DbSignature | DbType
     deriving (Show, Read, Eq)

@@ -19,6 +19,7 @@ import Scion.Packages
 import System.Directory
 import Data.Conduit (runResourceT)
+import Control.Monad.Logger (runStderrLoggingT)
 
 data Command = LoadLocalDatabase FilePath Bool
              | LoadHackageDatabase FilePath Bool
@@ -71,7 +72,7 @@ runWithState' :: Bool -> Maybe FilePath -> SQL[a] -> IO [ a]
 runWithState' use mpath action = if use && isJust mpath
                                     then do let path = fromJust mpath
-                                            runResourceT $ withSqliteConn (T.pack path) $ runSqlConn action
+                                            runResourceT $ runStderrLoggingT $ withSqliteConn (T.pack path) $ runSqlConn action
                                     else return []
 
 runDb :: CurrentDatabase -> (Maybe DbPackageIdentifier -> SQL [a]) -> BrowserM [a]
@@ -87,7 +88,7 @@   do fileExists <- lift $ doesFileExist path
      let fileExists' = fileExists `seq` fileExists
      when rebuild $
-          lift $ do runResourceT $ withSqliteConn (T.pack path) $ runSqlConn $ do
+          lift $ do runResourceT $ runStderrLoggingT $ withSqliteConn (T.pack path) $ runSqlConn $ do
                          runMigration migrateAll
                          createIndexes
                     pkgInfos' <- getPkgInfos
@@ -104,7 +105,7 @@      when (not fileExists' || rebuild) $
           lift $ do when fileExists' (removeFile path)
                     logToStdout "Rebuilding Hackage database"
-                    runResourceT $ withSqliteConn (T.pack path) $ runSqlConn $ do
+                    runResourceT $ runStderrLoggingT $ withSqliteConn (T.pack path) $ runSqlConn $ do
                         runMigration migrateAll
                         createIndexes
                     saveHackageDatabase path