| Index: logdog/server/cmd/logdog_archivist/main.go
|
| diff --git a/logdog/server/cmd/logdog_archivist/main.go b/logdog/server/cmd/logdog_archivist/main.go
|
| index 18b3b55a72a79abfb193ab280d01110495b01d5b..565520e386dd9b78b8a699a04f0fcf33eaa94d28 100644
|
| --- a/logdog/server/cmd/logdog_archivist/main.go
|
| +++ b/logdog/server/cmd/logdog_archivist/main.go
|
| @@ -9,7 +9,6 @@ import (
|
|
|
| "github.com/luci/luci-go/common/auth"
|
| "github.com/luci/luci-go/common/clock"
|
| - "github.com/luci/luci-go/common/config"
|
| "github.com/luci/luci-go/common/errors"
|
| "github.com/luci/luci-go/common/gcloud/gs"
|
| gcps "github.com/luci/luci-go/common/gcloud/pubsub"
|
| @@ -22,6 +21,7 @@ import (
|
| "github.com/luci/luci-go/logdog/api/config/svcconfig"
|
| "github.com/luci/luci-go/logdog/server/archivist"
|
| "github.com/luci/luci-go/logdog/server/service"
|
| + "github.com/luci/luci-go/luci_config/common/cfgtypes"
|
|
|
| "cloud.google.com/go/pubsub"
|
| "golang.org/x/net/context"
|
| @@ -219,7 +219,7 @@ func (a *application) runArchivist(c context.Context) error {
|
| func (a *application) GetSettingsLoader(acfg *svcconfig.Archivist) archivist.SettingsLoader {
|
| serviceID := a.ServiceID()
|
|
|
| - return func(c context.Context, proj config.ProjectName) (*archivist.Settings, error) {
|
| + return func(c context.Context, proj cfgtypes.ProjectName) (*archivist.Settings, error) {
|
| // Fold in our project-specific configuration, if valid.
|
| pcfg, err := a.ProjectConfig(c, proj)
|
| if err != nil {
|
|
|