From e62f6ba6d5a606410d2f565435bd9a9a6ffe78d4 Mon Sep 17 00:00:00 2001 From: Max Pedraza Date: Wed, 1 Dec 2021 01:33:17 +0100 Subject: [PATCH] Revert "In status page the rx and tx bytes now are shown with units" This reverts commit e97d6b95c10350e5cb1df7c5e68aed16182f8e2c. --- handler/routes.go | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/handler/routes.go b/handler/routes.go index ef14aab..156e701 100644 --- a/handler/routes.go +++ b/handler/routes.go @@ -469,8 +469,6 @@ func Status(db store.IStore) echo.HandlerFunc { PublicKey string ReceivedBytes int64 TransmitBytes int64 - Received string - Transmit string LastHandshakeTime time.Time LastHandshakeRel time.Duration Connected bool @@ -530,32 +528,6 @@ func Status(db store.IStore) echo.HandlerFunc { } pVm.Connected = pVm.LastHandshakeRel.Minutes() < 3. - units := []string{" ", " K", " M", " G", " T", " P", " E", " Z", " Y"} - - pow := 0 - temporal := float64(pVm.ReceivedBytes) - for ; temporal > 1024; temporal /= 1024 { - pow += 1 - if pow == len(units)-1 { - break - } - } - pVm.Received = fmt.Sprintf("%.3f", temporal) - pVm.Received = strings.TrimSuffix(strings.TrimRight(pVm.Received, "0"), ".") - pVm.Received = fmt.Sprintf("%s %sBytes", pVm.Received, units[pow]) - - pow = 0 - temporal = float64(pVm.TransmitBytes) - for ; temporal > 1024; temporal /= 1024 { - pow += 1 - if pow == len(units)-1 { - break - } - } - pVm.Transmit = fmt.Sprintf("%.3f", temporal) - pVm.Transmit = strings.TrimSuffix(strings.TrimRight(pVm.Transmit, "0"), ".") - pVm.Transmit = fmt.Sprintf("%s %sBytes", pVm.Transmit, units[pow]) - if _client, ok := m[pVm.PublicKey]; ok { pVm.Name = _client.Name pVm.Email = _client.Email