actually create one MVar per DB context ...

cardano-foundation · Dec 16, 2019 · 3835ae3 · 3835ae3
1 parent 159c9f4
commit 3835ae3
Showing 1 changed file with 17 additions and 15 deletions.
diff --git a/lib/core/src/Cardano/Wallet/DB/Sqlite.hs b/lib/core/src/Cardano/Wallet/DB/Sqlite.hs
@@ -220,28 +220,30 @@ newDBFactory
        -- ^ Path to database directory, or Nothing for in-memory database
     -> IO (DBFactory IO s k)
 newDBFactory cfg tr mDatabaseDir = do
-    mvar <- newEmptyMVar
     case mDatabaseDir of
         Nothing -> pure DBFactory
             { withDatabase = \_ action ->
                 withDBLayer cfg tracerDB Nothing (action . snd)
             , removeDatabase = \_ ->
                 pure ()
             }
-        Just databaseDir -> pure DBFactory
-            { withDatabase = \wid action ->
-                withDBLayer cfg tracerDB (Just $ databaseFile wid) $ \(ctx,db) -> do
-                    putMVar mvar ctx
-                    action db
-            , removeDatabase = \wid -> do
-                let files =
-                        [ databaseFile wid
-                        , databaseFile wid <> "-wal"
-                        , databaseFile wid <> "-shm"
-                        ]
-                readMVar mvar >>= destroyDBLayer
-                mapM_ removePathForcibly files
-            }
+        Just databaseDir -> do
+            mvar <- newEmptyMVar
+            pure DBFactory
+                { withDatabase = \wid action ->
+                    withDBLayer cfg tracerDB (Just $ databaseFile wid)
+                        $ \(ctx,db) -> do
+                            putMVar mvar ctx
+                            action db
+                , removeDatabase = \wid -> do
+                    let files =
+                            [ databaseFile wid
+                            , databaseFile wid <> "-wal"
+                            , databaseFile wid <> "-shm"
+                            ]
+                    readMVar mvar >>= destroyDBLayer
+                    mapM_ removePathForcibly files
+                }
           where
             databaseFilePrefix = keyTypeDescriptor $ Proxy @k
             databaseFile wid =