| Index: appengine/logdog/coordinator/endpoints/services/loadStream.go
|
| diff --git a/appengine/logdog/coordinator/endpoints/services/loadStream.go b/appengine/logdog/coordinator/endpoints/services/loadStream.go
|
| index e38bd0826e8bfe085f1eb29d9f428c11ab4481b0..bd43af31c459d3be8eba2b4a9782be9df1ef56e0 100644
|
| --- a/appengine/logdog/coordinator/endpoints/services/loadStream.go
|
| +++ b/appengine/logdog/coordinator/endpoints/services/loadStream.go
|
| @@ -8,16 +8,19 @@ import (
|
| ds "github.com/luci/gae/service/datastore"
|
| "github.com/luci/luci-go/appengine/logdog/coordinator"
|
| "github.com/luci/luci-go/common/api/logdog_coordinator/services/v1"
|
| + "github.com/luci/luci-go/common/clock"
|
| "github.com/luci/luci-go/common/grpcutil"
|
| "github.com/luci/luci-go/common/logdog/types"
|
| log "github.com/luci/luci-go/common/logging"
|
| + "github.com/luci/luci-go/common/proto/google"
|
| "golang.org/x/net/context"
|
| "google.golang.org/grpc/codes"
|
| )
|
|
|
| // LoadStream loads the log stream state.
|
| -func (b *Server) LoadStream(c context.Context, req *logdog.LoadStreamRequest) (*logdog.LoadStreamResponse, error) {
|
| - if err := Auth(c); err != nil {
|
| +func (s *Server) LoadStream(c context.Context, req *logdog.LoadStreamRequest) (*logdog.LoadStreamResponse, error) {
|
| + svc := s.GetServices()
|
| + if err := Auth(c, svc); err != nil {
|
| return nil, err
|
| }
|
|
|
| @@ -39,6 +42,18 @@ func (b *Server) LoadStream(c context.Context, req *logdog.LoadStreamRequest) (*
|
| if req.Desc {
|
| resp.Desc = ls.Descriptor
|
| }
|
| + resp.ArchivalKey = ls.ArchivalKey
|
| + resp.Age = google.NewDuration(ds.RoundTime(clock.Now(c)).Sub(ls.Created))
|
| +
|
| + log.Fields{
|
| + "path": path,
|
| + "hash": ls.HashID,
|
| + "terminalIndex": resp.State.TerminalIndex,
|
| + "archived": resp.State.Archived,
|
| + "purged": resp.State.Purged,
|
| + "age": resp.Age.Duration(),
|
| + "archivalKeySize": len(resp.ArchivalKey),
|
| + }.Infof(c, "Successfully loaded log stream state.")
|
| return &resp, nil
|
|
|
| case ds.ErrNoSuchEntity:
|
|
|