LogDog: Update client/bootstrap to generate URLs.

logdog/client/butlerlib/streamclient/client.go

 // Copyright 2015 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package streamclient
 
 import (
         "encoding/json"
         "fmt"
         "io"
@@ skipping 25 matching lines @@
 //   <protocol>:<protocol-specific-spec>
 //
 // Supported protocols and their respective specs are:
 //   - unix:/path/to/socket describes a stream server listening on UNIX domain
 //     socket at "/path/to/socket".
 //
 // Windows-only:
 //   - net.pipe:name describes a stream server listening on Windows named pipe
 //     "\\.\pipe\name".
 func New(path string) (Client, error) {
-        return DefaultRegistry.NewClient(path)
+        return defaultRegistry.NewClient(path)
 }
 
 func (c *clientImpl) NewStream(f streamproto.Flags) (Stream, error) {
         p := f.Properties()
         if err := p.Validate(); err != nil {
                 return nil, fmt.Errorf("streamclient: invalid stream properties: %s", err)
         }
 
         client, err := c.factory()
         if err != nil {
                 return nil, err
         }
         ownsClient := true
         defer func() {
                 // If we haven't written out the connection, close.
                 if ownsClient {
                         client.Close()
                 }
         }()
 
         data, err := json.Marshal(f)
         if err != nil {
                 return nil, fmt.Errorf("failed to marshal properties JSON: %s", err)
         }
 
         // Perform the handshake: magic + size(data) + data.
         s := &streamImpl{
-                Properties:  p,
                 WriteCloser: client,
+                props:       p,
         }
         if _, err := s.writeRaw(streamproto.ProtocolFrameHeaderMagic); err != nil {
                 return nil, fmt.Errorf("failed to write magic number: %s", err)
         }
         if err := s.writeRecord(data); err != nil {
                 return nil, fmt.Errorf("failed to write properties: %s", err)
         }
 
         ownsClient = false // Passing ownership to caller.
         return s, nil
 }