Holumbus-Distribution 0.0.1 → 0.0.1.1

raw patch · 3 files changed

+15/−9 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Holumbus-Distribution.cabal +1/−1
• source/Holumbus/Common/Logging.hs +1/−1
• source/Holumbus/Network/Core.hs +13/−7

@@ -1,5 +1,5 @@ name:          Holumbus-Distribution-version:       0.0.1+version:       0.0.1.1 license:       OtherLicense license-file:  LICENSE author:        Stefan Schmidt, Uwe Schmidt

@@ -55,7 +55,7 @@     -- updateGlobalLogger rootLoggerName (addHandler s)          -- this will be removed in next versions-    -- updateGlobalLogger "Holumbus" (setLevel DEBUG)+    updateGlobalLogger "Holumbus" (setLevel WARNING)     -- updateGlobalLogger "Holumbus.Network" (setLevel WARNING)     -- updateGlobalLogger "Holumbus.MapReduce.TaskProcessor.task" (setLevel WARNING)     -- updateGlobalLogger "Holumbus.FileSystem.Storage.FileStorage" (setLevel WARNING)

@@ -166,13 +166,19 @@ -- | Gets the first free port number and creates of new socket on it. getFirstSocket :: PortNumber -> PortNumber -> IO (Maybe (Socket, PortNumber)) getFirstSocket actPo maxPo-  | actPo > maxPo = return Nothing-  | otherwise -    = do-      handleAll (return (getFirstSocket (actPo+1) maxPo)) $-        do-        socket <- getSocket (PortNumber actPo)-        return (Just (socket, actPo))     +  = do+    -- due to a bug in Network.Socket, we cannot use the (>) directly for PortNumbers+    let actI = toInteger actPo+        maxI = toInteger maxPo+    if (actI > maxI)+      then do+        return Nothing +      else do+        handleAll (return (getFirstSocket (actPo+1) maxPo)) $+          do+          debugM localLogger $ "getFirstSocket: getting Socket for: " ++ show actPo+          socket <- getSocket (PortNumber actPo)+          return (Just (socket, actPo))        -- | Opens a socket on a port number.