Move "common/config" common types into cfgtypes.

logdog/server/collector/coordinator/cache.go

 // Copyright 2016 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 coordinator
 
 import (
         "sync"
         "time"
 
         "github.com/luci/luci-go/common/clock"
-        "github.com/luci/luci-go/common/config"
         "github.com/luci/luci-go/common/data/caching/lru"
         "github.com/luci/luci-go/common/errors"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/sync/promise"
         "github.com/luci/luci-go/common/tsmon/field"
         "github.com/luci/luci-go/common/tsmon/metric"
         "github.com/luci/luci-go/logdog/common/types"
+        "github.com/luci/luci-go/luci_config/common/cfgtypes"
         "golang.org/x/net/context"
 )
 
 const (
         // DefaultSize is the default (maximum) size of the LRU cache.
         DefaultSize = 1024 * 1024
 
         // DefaultExpiration is the default expiration value.
         DefaultExpiration = 10 * time.Minute
 )
@@ skipping 89 matching lines @@
 func (c *cache) TerminateStream(ctx context.Context, r *TerminateRequest) error {
         entry, _ := c.getCacheEntry(ctx, cacheEntryKey{
                 project: r.Project,
                 path:    r.Path,
         })
         return entry.terminateStream(ctx, c.Coordinator, *r)
 }
 
 // cacheEntryKey is the LRU key for a cacheEntry.
 type cacheEntryKey struct {
-        project config.ProjectName
+        project cfgtypes.ProjectName
         path    types.StreamPath
 }
 
 // cacheEntry is a cached state for a specific log stream.
 //
 // It contains promises for each singleton operation: one for stream
 // registration (registerP), and one for stream termination (terminateP).
 //
 // There are three states to promise evaluation:
 //      - If the promise is nil, it will be populated. Any concurrent requests
@@ skipping 155 matching lines @@
                         ce.terminalIndex = tidx
                 }
         })
 }
 
 func (ce *cacheEntry) withLock(f func()) {
         ce.Lock()
         defer ce.Unlock()
         f()
 }