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

Enhance shortHumanDuration to handle more situation

Browse Source 
Allow 2 seconds deviation of current time. For time more than 2
seconds from current time, output as '<invalid>'.
This commit is contained in:
hurf
2015-08-14 17:10:22 +08:00
parent 501594f8c7
commit c20ed0344a
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubectl/resource_printer.go
View File

@@ -361,7 +361,13 @@ func podHostString(host, ip string) string {
}
func shortHumanDuration(d time.Duration) string {
if seconds := int(d.Seconds()); seconds < 60 {
// Allow deviation no more than 2 seconds(excluded) to tolerate machine time
// inconsistence, it can be considered as almost now.
if seconds := int(d.Seconds()); seconds < -1 {
return fmt.Sprintf("<invalid>")
} else if seconds < 0 {
return fmt.Sprintf("0s")
} else if seconds < 60 {
return fmt.Sprintf("%ds", seconds)
} else if minutes := int(d.Minutes()); minutes < 60 {
return fmt.Sprintf("%dm", minutes)