| Index: logdog/client/cmd/logdog_cat/subcommandList.go
|
| diff --git a/logdog/client/cmd/logdog_cat/subcommandList.go b/logdog/client/cmd/logdog_cat/subcommandList.go
|
| index 36781da42a585e5038981a2c9caffe2084de9913..2fac2ad71e3d25dd2e84916f2fd5aa45f777606e 100644
|
| --- a/logdog/client/cmd/logdog_cat/subcommandList.go
|
| +++ b/logdog/client/cmd/logdog_cat/subcommandList.go
|
| @@ -108,42 +108,38 @@ func (*listCommandRun) attributes(lr *coordinator.ListResult) string {
|
| var parts []string
|
|
|
| if s := lr.State; s != nil {
|
| - if d := s.Desc; d != nil {
|
| - p := []string{
|
| - d.GetTimestamp().Time().String(),
|
| - fmt.Sprintf("type:%s", d.StreamType.String()),
|
| - }
|
| + p := []string{
|
| + s.Desc.GetTimestamp().Time().String(),
|
| + fmt.Sprintf("type:%s", s.Desc.StreamType.String()),
|
| + }
|
|
|
| - if t := d.GetTags(); len(t) > 0 {
|
| - tstr := make([]string, 0, len(t))
|
| - for k, v := range t {
|
| - if v == "" {
|
| - tstr = append(tstr, k)
|
| - } else {
|
| - tstr = append(tstr, fmt.Sprintf("%s=%s", k, v))
|
| - }
|
| + if t := s.Desc.GetTags(); len(t) > 0 {
|
| + tstr := make([]string, 0, len(t))
|
| + for k, v := range t {
|
| + if v == "" {
|
| + tstr = append(tstr, k)
|
| + } else {
|
| + tstr = append(tstr, fmt.Sprintf("%s=%s", k, v))
|
| }
|
| - sort.Strings(tstr)
|
| - p = append(p, fmt.Sprintf("tags:{%s}", strings.Join(tstr, ", ")))
|
| }
|
| -
|
| - parts = append(parts, p...)
|
| + sort.Strings(tstr)
|
| + p = append(p, fmt.Sprintf("tags:{%s}", strings.Join(tstr, ", ")))
|
| }
|
|
|
| - if st := s.State; st != nil {
|
| - if st.TerminalIndex >= 0 {
|
| - parts = append(parts, fmt.Sprintf("terminal:%d", st.TerminalIndex))
|
| - } else {
|
| - parts = append(parts, "streaming")
|
| - }
|
| + parts = append(parts, p...)
|
|
|
| - if st.Archived {
|
| - parts = append(parts, "archived")
|
| - }
|
| + if s.State.TerminalIndex >= 0 {
|
| + parts = append(parts, fmt.Sprintf("terminal:%d", s.State.TerminalIndex))
|
| + } else {
|
| + parts = append(parts, "streaming")
|
| + }
|
|
|
| - if st.Purged {
|
| - parts = append(parts, "purged")
|
| - }
|
| + if s.State.Archived {
|
| + parts = append(parts, "archived")
|
| + }
|
| +
|
| + if s.State.Purged {
|
| + parts = append(parts, "purged")
|
| }
|
| }
|
|
|
|
|