--persistent --nonpersistent

diff --git a/Network/AMQP/Utils/Options.hs b/Network/AMQP/Utils/Options.hs
index bb1cf8fd6f7758fd7e3865d03a864ea3286318f0..9511b7e107714fc54762b8d93a03919c5981b4f4 100644 (file)
--- a/Network/AMQP/Utils/Options.hs
+++ b/Network/AMQP/Utils/Options.hs
@@ -5,6 +5,7 @@ import qualified Data.Map as M
 import Data.Maybe
 import Data.Text (Text, pack)
 import Data.Version (showVersion)
+import Network.AMQP
 import Network.AMQP.Types
 import Paths_amqp_utils (version)
 import System.Console.GetOpt
@@ -49,6 +50,7 @@ data Args = Args
   , fnheader :: [String]
   , suffix :: [String]
   , magic :: Bool
+  , persistent :: Maybe DeliveryMode
   }
 
 instance Default Args where
@@ -92,6 +94,7 @@ instance Default Args where
       []
       []
       False
+      Nothing
 
 -- | Common options
 cOptions :: [OptDescr (Args -> Args)]
@@ -304,7 +307,18 @@ aOptions =
       ['m']
       ["magic"]
       (NoArg (\o -> o {magic = not (magic o)}))
-      ("Toggle setting content-type and -encoding from file contents (default: " ++ show (magic def) ++ ")")
+      ("Toggle setting content-type and -encoding from file contents (default: " ++
+       show (magic def) ++ ")")
+  , Option
+      []
+      ["persistent"]
+      (NoArg (\o -> o {persistent = Just Persistent}))
+      "Set persistent delivery"
+  , Option
+      []
+      ["nonpersistent"]
+      (NoArg (\o -> o {persistent = Just NonPersistent}))
+      "Set nonpersistent delivery"
   ]
 
 -- | Options for the executables

diff --git a/agitprop.hs b/agitprop.hs
index 88ed85ec6cad7e05bf109a1a9ab04233cf9328c4..b67dd0c89892846ee8690eaf30b73d2a5116f625 100644 (file)
--- a/agitprop.hs
+++ b/agitprop.hs
@@ -125,7 +125,7 @@ publishOneMsg' c a fn f = do
       (T.pack $ rKey a)
       newMsg
         { msgBody = f
-        , msgDeliveryMode = Just Persistent
+        , msgDeliveryMode = persistent a
         , msgTimestamp = Just now
         , msgID = msgid a
         , msgType = msgtype a