Move "common/config" common types into cfgtypes.

logdog/client/butler/butler.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 butler
 
 import (
         "errors"
         "fmt"
         "io"
         "sort"
         "sync"
         "time"
 
         "github.com/luci/luci-go/common/clock"
-        "github.com/luci/luci-go/common/config"
         "github.com/luci/luci-go/common/data/stringset"
         "github.com/luci/luci-go/common/iotools"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/proto/google"
         "github.com/luci/luci-go/common/runtime/paniccatcher"
         "github.com/luci/luci-go/common/sync/parallel"
         "github.com/luci/luci-go/logdog/client/butler/bundler"
         "github.com/luci/luci-go/logdog/client/butler/output"
         "github.com/luci/luci-go/logdog/client/butler/streamserver"
         "github.com/luci/luci-go/logdog/client/butlerlib/streamproto"
         "github.com/luci/luci-go/logdog/common/types"
+        "github.com/luci/luci-go/luci_config/common/cfgtypes"
 
         "golang.org/x/net/context"
 )
 
 const (
         // DefaultMaxBufferAge is the default amount of time that a log entry may
         // be buffered before being dispatched.
         DefaultMaxBufferAge = time.Duration(5 * time.Second)
 
         // DefaultOutputWorkers is the default number of output workers to use.
         DefaultOutputWorkers = 16
 
         // streamBufferSize is the maximum amount of stream data to buffer in memory.
         streamBufferSize = 1024 * 1024 * 5
 
         // keepAliveChannelSize is the size of the I/O keep-alive channel buffer.
         keepAliveChannelSize = 128
 )
 
 // Config is the set of Butler configuration parameters.
 type Config struct {
         // Output is the output instance to use for log dispatch.
         Output output.Output
         // OutputWorkers is the number of simultaneous goroutines that will be used
         // to output Butler log data. If zero, DefaultOutputWorkers will be used.
         OutputWorkers int
 
         // Project is the project that the log stream will be bound to.
-        Project config.ProjectName
+        Project cfgtypes.ProjectName
         // Prefix is the log stream common prefix value.
         Prefix types.StreamName
 
         // GlobalTags are a set of global log stream tags to apply to individual
         // streams on registration. Individual stream tags will override tags with
         // the same key.
         GlobalTags streamproto.TagMap
 
         // BufferLogs, if true, instructs the butler to buffer collected log data
         // before sending it to Output.
@@ skipping 595 matching lines @@
         // shutdown prematurely, so this should be reasonably quick.
         b.Activate()
 }
 
 // Returns the configured Butler error.
 func (b *Butler) getRunErr() error {
         b.shutdownMu.Lock()
         defer b.shutdownMu.Unlock()
         return b.runErr
 }