From 6b8840647e4da6dd8e273353c44bf42cb58c7f7c Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 1 Feb 2022 00:27:44 +0100 Subject: [PATCH] Use better duration formating --- connector/docker.go | 3 ++- go.mod | 1 + go.sum | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/connector/docker.go b/connector/docker.go index 91b0e30..5874922 100644 --- a/connector/docker.go +++ b/connector/docker.go @@ -7,6 +7,7 @@ import ( "time" "github.com/op/go-logging" + "github.com/hako/durafmt" "github.com/bcicen/ctop/connector/collector" "github.com/bcicen/ctop/connector/manager" @@ -213,7 +214,7 @@ func calcUptime(insp *api.Container) string { endTime = time.Now() } uptime := endTime.Sub(insp.State.StartedAt) - return uptime.Truncate(time.Second).String() + return durafmt.Parse(uptime).LimitFirstN(1).String() } // Mark all container IDs for refresh diff --git a/go.mod b/go.mod index 296cc92..f03464d 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ require ( github.com/c9s/goprocinfo v0.0.0-20170609001544-b34328d6e0cd github.com/fsouza/go-dockerclient v1.7.0 github.com/gizak/termui v2.3.0+incompatible + github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b // indirect github.com/jgautheron/codename-generator v0.0.0-20150829203204-16d037c7cc3c github.com/mattn/go-runewidth v0.0.0-20170201023540-14207d285c6c github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect diff --git a/go.sum b/go.sum index 0346b2f..ad100f1 100644 --- a/go.sum +++ b/go.sum @@ -85,6 +85,8 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b h1:wDUNC2eKiL35DbLvsDhiblTUXHxcOPwQSCzi7xpQUN4= +github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b/go.mod h1:VzxiSdG6j1pi7rwGm/xYI5RbtpBgM8sARDXlvEvxlu0= github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=