github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Remove gogoproto.stdtime

Browse Source 
This commit removes gogoproto.stdtime, since it is not supported by
Google's official toolchain
(see https://github.com/containerd/containerd/issues/6564).

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
Kazuyoshi Kato
2022-04-18 22:12:15 +00:00
parent 26a3ab446b
commit 80b825ca2c
71 changed files with 1803 additions and 1594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
process.go
View File

@@ -26,6 +26,7 @@ import (
"github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/protobuf"
)
// Process represents a system process
@@ -164,7 +165,7 @@ func (p *process) Wait(ctx context.Context) (<-chan ExitStatus, error) {
}
c <- ExitStatus{
code: r.ExitStatus,
exitedAt: r.ExitedAt,
exitedAt: protobuf.FromTimestamp(r.ExitedAt),
}
}()
return c, nil
@@ -224,7 +225,7 @@ func (p *process) Delete(ctx context.Context, opts ...ProcessDeleteOpts) (*ExitS
p.io.Wait()
p.io.Close()
}
return &ExitStatus{code: r.ExitStatus, exitedAt: r.ExitedAt}, nil
return &ExitStatus{code: r.ExitStatus, exitedAt: protobuf.FromTimestamp(r.ExitedAt)}, nil
}
func (p *process) Status(ctx context.Context) (Status, error) {