LGTM, thanks On Thu, Oct 16, 2014 at 12:17 PM, Klaus Aehlig <aeh...@google.com> wrote:
> > > - parseresult <- parseAddress opts C.defaultConfdPort > > > + defaultPort <- withDefaultOnIOError C.defaultConfdPort > > > + . liftM (fromIntegral . servicePort) > > > + $ getServiceByName C.confd "tcp" > > Well, then hide it in the default of the library... > > commit 1c1303f7239e2f52737f03fae130cf48010c6d94 > Author: Klaus Aehlig <aeh...@google.com> > Date: Thu Oct 16 12:16:29 2014 +0200 > > INTERDIFF > > diff --git a/src/Ganeti/Confd/Server.hs b/src/Ganeti/Confd/Server.hs > index dac0443..95f6d66 100644 > --- a/src/Ganeti/Confd/Server.hs > +++ b/src/Ganeti/Confd/Server.hs > @@ -45,7 +45,7 @@ import Data.IORef > import Data.List > import qualified Data.Map as M > import Data.Maybe (fromMaybe) > -import Network.BSD (getServiceByName, servicePort) > +import Network.BSD (getServicePortNumber) > import qualified Network.Socket as S > import System.Exit > import System.IO > @@ -325,8 +325,8 @@ type PrepResult = (S.Socket, IORef (Result > (ConfigData, LinkIpMap))) > checkMain :: CheckFn (S.Family, S.SockAddr) > checkMain opts = do > defaultPort <- withDefaultOnIOError C.defaultConfdPort > - . liftM (fromIntegral . servicePort) > - $ getServiceByName C.confd "tcp" > + . liftM fromIntegral > + $ getServicePortNumber C.confd > parseresult <- parseAddress opts defaultPort > case parseresult of > Bad msg -> do > > > > -- > Klaus Aehlig > Google Germany GmbH, Dienerstr. 12, 80331 Muenchen > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores > -- Helga Velroyen | Software Engineer | hel...@google.com | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
