[bitbake-devel] [PATCH 5/8] bitbake: add -B option to bind with interface

[Richard Purdie]

On Wed, 2012-01-11 at 13:30 +0000, Xu, Dongxiao wrote:
> > >      # Save a logfile for cooker into the current working directory. When the
> > >      # server is daemonized this logfile will be truncated.
> > >      cooker_logfile = os.path.join(os.getcwd(), "cooker.log") @@
> > > -211,9 +210,15 @@ Default BBFILES are the .bb files in the current
> > directory.""")
> > >      # of the UIs (e.g. for DISPLAY, etc.)
> > >      bb.utils.clean_environment()
> > >
> > > -    server = server.BitBakeServer()
> > > +    if configuration.server_only:
> > > +        if configuration.servertype != "xmlrpc":
> > > +            sys.exit("FATAL: If '--server-only' is defined, we must set the
> > servertype as 'xmlrpc'.\n")
> > > +        server = server.BitBakeServer()
> > > +        server.initServer((configuration.bind, 0))
> > > +    else:
> > > +        server = server.BitBakeServer()
> > > +        server.initServer()
> > 
> > This looks like it will silently ignore configuration.bind in the non server-only case.
> > Don't you need something like:
> > 
> > 
> > +    if configuration.server_only:
> > +        if configuration.servertype != "xmlrpc":
> > +            sys.exit("FATAL: If '--server-only' is defined, we must set the
> > servertype as 'xmlrpc'.\n")
> > +        server = server.BitBakeServer()
> > +        server.initServer((configuration.bind, 0))
> > +    elif configuration.bind:
> > +        server = server.BitBakeServer()
> > +        server.initServer((configuration.bind, 0))
> > +    else:
> > +        server = server.BitBakeServer()
> > +        server.initServer()
> > 
> > ?
> 
> I had a thought of this code piece, we may need the following code. For --server-only option, it requires --bind, while not vice versa.
> 
> @@ -189,8 +191,14 @@ Default BBFILES are the .bb files in the current directory.""")
>          sys.exit("FATAL: Invalid server type '%s' specified.\n"
>                   "Valid interfaces: xmlrpc, process [default], none." % servertype)
> 
> -    if configuration.server_only and configuration.servertype != "xmlrpc":
> -        sys.exit("FATAL: If '--server-only' is defined, we must set the servertype as 'xmlrpc'.\n")
> +    if configuration.server_only:
> +        if configuration.servertype != "xmlrpc":
> +            sys.exit("FATAL: If '--server-only' is defined, we must set the servertype as 'xmlrpc'.\n")
> +        if not configuration.bind:
> +            sys.exit("FATAL: The '--server-only' option requires a name/address to bind to with the -B option.\n")
> +
> +    if configuration.bind and configuration.servertype != "xmlrpc":
> +        sys.exit("FATAL: If '-B' or '--bind' is defined, we must set the servertype as 'xmlrpc'.\n")

That looks reasonable to me.

Cheers,

Richard