LogDog: Add collector service implementation.

client/cmd/logdog_butler/main.go

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package main
 
 import (
         "errors"
         "flag"
         "fmt"
         "net/http"
         "os"
         "os/signal"
         "runtime/pprof"
         "time"
 
         "github.com/luci/luci-go/client/authcli"
         "github.com/luci/luci-go/client/internal/flags/multiflag"
         "github.com/luci/luci-go/client/internal/logdog/butler"
         "github.com/luci/luci-go/client/internal/logdog/butler/output"
         "github.com/luci/luci-go/common/auth"
         "github.com/luci/luci-go/common/clock/clockflag"
         "github.com/luci/luci-go/common/gcloud/gcps"
         "github.com/luci/luci-go/common/logdog/types"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/logging/gologger"
         "github.com/luci/luci-go/common/paniccatcher"
         "github.com/maruel/subcommands"
         "golang.org/x/net/context"
-        "google.golang.org/cloud"
 )
 
 const (
         // flagErrorReturnCode is returned when there is an error with the Butler's
         // command-line configuration.
         configErrorReturnCode = 2
 
         // runtimeErrorReturnCode is returned when the execution fails due to a Butler
         // error. This is intended to help differentiate Butler errors from
         // passthrough bootstrapped subprocess errors.
@@ skipping 86 matching lines @@
 
                 client, err := auth.NewAuthenticator(auth.SilentLogin, opts).Client()
                 if err != nil {
                         return nil, err
                 }
                 a.client = client
         }
         return a.client, nil
 }
 
-func (a *butlerApplication) authenticatedContext(ctx context.Context, project string) (context.Context, error) {

[dnj (Google), 2016/01/21 04:36:24]

No longer needed w/ Pub/Sub changes.

-        if project == "" {
-                return nil, errors.New("must supply a project name")
-        }
-
-        client, err := a.authenticatedClient(ctx)
-        if err != nil {
-                return nil, err
-        }
-
-        return cloud.WithContext(ctx, project, client), nil
-}
-
 func (a *butlerApplication) configOutput() (output.Output, error) {
         factory := a.outputConfig.getFactory()
         if factory == nil {
                 return nil, errors.New("main: No output is configured")
         }
 
         output, err := factory.configOutput(a)
         if err != nil {
                 return nil, err
         }
@@ skipping 157 matching lines @@
 
         paniccatcher.Do(func() {
                 rc = mainImpl(ctx, os.Args[1:])
         }, func(p *paniccatcher.Panic) {
                 log.Fields{
                         "panic.error": p.Reason,
                 }.Errorf(ctx, "Panic caught in main:\n%s", p.Stack)
                 rc = runtimeErrorReturnCode
         })
 }