QMConfig tools stuck at combineQM

1 files changed, 3 insertions, 4 deletions

diff --git a/server/src/Thermoprint/Server.hs b/server/src/Thermoprint/Server.hs
index cd3a4ed..49f3e82 100644
--- a/server/src/Thermoprint/Server.hs
+++ b/server/src/Thermoprint/Server.hs
@@ -14,8 +14,8 @@ module Thermoprint.Server
        , module Data.Default.Class
        , module Servant.Server.Internal.Enter
        , module Thermoprint.Server.Printer
-       , module Thermoprint.Server.Queue
        , module Thermoprint.Server.QMConfig
+       , Queue(..), QueueEntry(..)
        ) where
 
 import Data.Default.Class
@@ -78,7 +78,7 @@ import Thermoprint.Server.Push
 
 import Thermoprint.Server.Database
 import Thermoprint.Server.Printer
-import Thermoprint.Server.Queue
+import Thermoprint.Server.Queue hiding (intersection, idQM, union, nullQM, runQM)
 import Thermoprint.Server.QMConfig
 import qualified Thermoprint.Server.API as API (thermoprintServer)
 import Thermoprint.Server.API hiding (thermoprintServer)
@@ -140,8 +140,7 @@ thermoprintServer dyre io = Dyre.wrapMain $ Dyre.defaultParams
           gcChan <- liftIO newTChanIO
           fork tMgr $ jobGC gcChan
           let
-            runQM' (queueManagers -> QMConfig qm nat) printer = unNat nat $ runQM gcChan qm printer
-            runQM' (queueManagers -> QMConfig' qm) printer = hoist liftIO $ runQM gcChan qm printer
+            runQM' = runQM gcChan . queueManagers
           mapM_ (fork tMgr . uncurry runQM') $ Map.toList printers
           nChan <- liftIO $ newBroadcastTChanIO
           let