Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

Unified Diff: logdog/server/service/config/config.go

Issue 2626433004: Move "common/config" common types into cfgtypes. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « logdog/server/collector/utils_test.go ('k') | logdog/server/service/service.go » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: logdog/server/service/config/config.go
diff --git a/logdog/server/service/config/config.go b/logdog/server/service/config/config.go
index ee6ace63be80e889989e3a592dcd52c57d47f359..e9293a3bd50270397bcfe7f00812917d6acec288 100644
--- a/logdog/server/service/config/config.go
+++ b/logdog/server/service/config/config.go
@@ -9,12 +9,14 @@ import (
"fmt"
"time"
- "github.com/golang/protobuf/proto"
"github.com/luci/luci-go/common/clock"
"github.com/luci/luci-go/common/config"
"github.com/luci/luci-go/common/data/caching/proccache"
log "github.com/luci/luci-go/common/logging"
"github.com/luci/luci-go/logdog/api/config/svcconfig"
+ "github.com/luci/luci-go/luci_config/common/cfgtypes"
+
+ "github.com/golang/protobuf/proto"
"golang.org/x/net/context"
)
@@ -149,7 +151,7 @@ func (m *Manager) Config() *svcconfig.Config {
}
// ProjectConfig returns the project configuration.
-func (m *Manager) ProjectConfig(c context.Context, project config.ProjectName) (*svcconfig.ProjectConfig, error) {
+func (m *Manager) ProjectConfig(c context.Context, project cfgtypes.ProjectName) (*svcconfig.ProjectConfig, error) {
serviceID := m.o.ServiceID
if serviceID == "" {
return nil, errors.New("no service ID specified")
« no previous file with comments | « logdog/server/collector/utils_test.go ('k') | logdog/server/service/service.go » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698