use right data types for heartbeat and portnumber

diff --git a/Network/AMQP/Utils/Connection.hs b/Network/AMQP/Utils/Connection.hs
index ea5120644649a19abad478e3735c68123a25cf4a..2e4f694a16063409fb045c10c5930f2e246cf636 100644 (file)
--- a/Network/AMQP/Utils/Connection.hs
+++ b/Network/AMQP/Utils/Connection.hs
@@ -48,8 +48,8 @@ connect args = do
             if (tls args)
               then Just (TLSCustom myTLS)
               else Nothing
-        , coServers = [(server args, fromIntegral $ portnumber args)]
-        , coHeartbeatDelay = fmap fromIntegral $ heartBeat args
+        , coServers = [(server args, portnumber args)]
+        , coHeartbeatDelay = heartBeat args
         , coName = fmap T.pack $ connectionName args
         }
   Just chan <- timeout to $ openChannel conn

diff --git a/Network/AMQP/Utils/Helpers.hs b/Network/AMQP/Utils/Helpers.hs
index 27d0f3ca2e93e48d25f623261c4a2c1a8f6693f8..b69207d4bc74e390d3bdb568f1acbbaa4ff7dfe5 100644 (file)
--- a/Network/AMQP/Utils/Helpers.hs
+++ b/Network/AMQP/Utils/Helpers.hs
@@ -14,6 +14,7 @@ import Data.Time.Clock.POSIX
 import Network.AMQP
 import Network.AMQP.Types
 import Network.AMQP.Utils.Options
+import Network.Socket (PortNumber)
 import System.Exit
 import System.IO
 import System.Process
@@ -68,6 +69,8 @@ instance Flexprint AMQPException
 
 instance Flexprint ConfirmationResult
 
+instance Flexprint PortNumber
+
 -- | log marker
 hr :: String -> IO ()
 hr x = hPutStrLn stderr hr' >> hFlush stderr

diff --git a/Network/AMQP/Utils/Options.hs b/Network/AMQP/Utils/Options.hs
index e102d6733487ac5db7f944b9dd434be4e0fbedc5..8e65caa13d36f7f0c537bf9a10b8a67b9e8661a7 100644 (file)
--- a/Network/AMQP/Utils/Options.hs
+++ b/Network/AMQP/Utils/Options.hs
@@ -5,12 +5,14 @@ import qualified Data.Map as M
 import Data.Maybe
 import Data.Text (Text, pack)
 import Data.Version (showVersion)
+import Data.Word (Word16)
 import Network.AMQP
 import Network.AMQP.Types
+import Network.Socket (PortNumber)
 import Paths_amqp_utils (version)
 import System.Console.GetOpt
 
-portnumber :: Args -> Int
+portnumber :: Args -> PortNumber
 portnumber a
   | (port a) == Nothing && (tls a) = 5671
   | (port a) == Nothing = 5672
@@ -19,7 +21,7 @@ portnumber a
 -- | A data type for our options
 data Args = Args
   { server :: String
-  , port :: Maybe Int
+  , port :: Maybe PortNumber
   , tls :: Bool
   , vHost :: String
   , currentExchange :: String
@@ -33,7 +35,7 @@ data Args = Args
   , user :: String
   , pass :: String
   , preFetch :: Int
-  , heartBeat :: Maybe Int
+  , heartBeat :: Maybe Word16
   , tempDir :: Maybe String
   , additionalArgs :: [String]
   , connectionName :: Maybe String
@@ -358,7 +360,7 @@ allOptions =
         ['p']
         ["port"]
         (ReqArg (\s o -> o {port = Just (read s)}) "PORT")
-        ("Server Port Number (default: " ++ show (port def) ++ ")"))
+        ("Server Port Number (default: " ++ show (portnumber def) ++ ")"))
   , ( "akrp"
     , Option
         ['T']

diff --git a/amqp-utils.cabal b/amqp-utils.cabal
index 97efcf933f4803caf20404e546d197a05c00775d..dde54dd1d8c48d96a324fa048f0b565d9c360cbf 100644 (file)
--- a/amqp-utils.cabal
+++ b/amqp-utils.cabal
@@ -44,6 +44,7 @@ executable konsum
                        process,
                        bytestring,
                        x509-system,
+                       network > 2.6,
                        tls >= 1.3.9,
                        amqp >=0.17
 
@@ -67,6 +68,7 @@ executable agitprop
                        process,
                        bytestring,
                        x509-system,
+                       network > 2.6,
                        tls >= 1.3.9,
                        amqp >=0.17,
                        unix >= 2.7,
@@ -93,6 +95,7 @@ executable plane
                        process,
                        bytestring,
                        x509-system,
+                       network > 2.6,
                        tls >= 1.3.9,
                        amqp >=0.17,
                        unix >= 2.7
@@ -117,6 +120,7 @@ executable arbeite
                        process,
                        bytestring,
                        x509-system,
+                       network > 2.6,
                        tls >= 1.3.9,
                        amqp >=0.17,
                        unix >= 2.7