agitprop: move waitForConfirms call

diff --git a/agitprop.hs b/agitprop.hs
index 44984a3c68c3fd6218c6a4f16e36594ce889b8ff..80b8c9a26967a968ecbcb993c533d2e1776bbf63 100644 (file)
--- a/agitprop.hs
+++ b/agitprop.hs
@@ -9,9 +9,8 @@
 import           Control.Concurrent
 import qualified Control.Exception                as X
 import           Control.Monad                    (forM_)
-import qualified Data.ByteString.Lazy.Char8       as BL
-import qualified RawFilePath.Directory            as RD
 import qualified Data.ByteString.Char8            as BS
+import qualified Data.ByteString.Lazy.Char8       as BL
 import qualified Data.Map                         as M
 import           Data.Maybe
 import qualified Data.Text                        as T
@@ -26,6 +25,7 @@ import           Network.AMQP.Utils.Connection
 import           Network.AMQP.Utils.Helpers
 import           Network.AMQP.Utils.Options
 import           Paths_amqp_utils                 (version)
+import qualified RawFilePath.Directory            as RD
 import           System.Environment
 import           System.Exit
 import           System.FilePath.Posix.ByteString
@@ -94,13 +94,13 @@ main = do
          if (lineMode args)
            then mapM_ (publishOneMsg (currentExchange args) (rKey args) Nothing) (BL.lines messageFile)
            else publishOneMsg (currentExchange args) (rKey args) (Just (inputFile')) messageFile
-         hr "END sending")
+         hr "END sending"
+         if (confirm args)
+           then waitForConfirms chan >>= printparam "confirmed"
+           else return ()
+         X.catch (closeConnection conn) exceptionHandler
+         )
     exceptionHandler
-  -- all done. wait and close.
-  if (confirm args)
-    then waitForConfirms chan >>= printparam "confirmed"
-    else return ()
-  X.catch (closeConnection conn) exceptionHandler
 
 #if linux_HOST_OS
 -- | watch a hotfolder