Merge pull request #1382 from mrpalide/fix/add-info-field-to-services…

…-for-vpn-metric add Info field to Service struct
skycoin · Oct 10, 2022 · 79557a6 · 79557a6
2 parents 0e854ea + 9353716
commit 79557a6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -48,7 +48,7 @@ require (
 	github.com/jaypipes/ghw v0.9.0
 	github.com/lib/pq v1.10.7
 	github.com/skycoin/dmsg v0.0.0-20221007110410-643ca4fc9f82
-	github.com/skycoin/skywire-utilities v0.0.0-20220712142443-abafa30105ce
+	github.com/skycoin/skywire-utilities v0.0.0-20220812192633-7137eb730383
 	github.com/skycoin/systray v1.10.1-0.20220630135132-48d2a1fb85d8
 	github.com/spf13/pflag v1.0.5
 	periph.io/x/periph v3.6.8+incompatible

diff --git a/go.sum b/go.sum
@@ -495,8 +495,9 @@ github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 h1:1Nc5EBY6pjfw1kwW0
 github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:UXghlricA7J3aRD/k7p/zBObQfmBawwCxIVPVjz2Q3o=
 github.com/skycoin/skycoin v0.27.1 h1:HatxsRwVSPaV4qxH6290xPBmkH/HgiuAoY2qC+e8C9I=
 github.com/skycoin/skycoin v0.27.1/go.mod h1:78nHjQzd8KG0jJJVL/j0xMmrihXi70ti63fh8vXScJw=
-github.com/skycoin/skywire-utilities v0.0.0-20220712142443-abafa30105ce h1:+AkZeazhMXpzdPhAG2tn71ubVSPwUECMXYK/LIIVQSU=
 github.com/skycoin/skywire-utilities v0.0.0-20220712142443-abafa30105ce/go.mod h1:B63p56igl38Ha+zjqi26d2om6XEe9jozwB6kzAWMnm0=
+github.com/skycoin/skywire-utilities v0.0.0-20220812192633-7137eb730383 h1:aPbbFD9yaq2q2+aKfMDzTot4lo283hyFx23SGXhNTJE=
+github.com/skycoin/skywire-utilities v0.0.0-20220812192633-7137eb730383/go.mod h1:X5H+fKC3rD11/sm4t9V2FWy/aet7OdEilaO2Ar3waXY=
 github.com/skycoin/systray v1.10.1-0.20220630135132-48d2a1fb85d8 h1:2IA2Iw6rgNpbd/rogzBbmNpfGLPhf9zYE68RY8CmU4k=
 github.com/skycoin/systray v1.10.1-0.20220630135132-48d2a1fb85d8/go.mod h1:nsO0LzaKDTG2m9xVm8GPtg7dEx+pP1cZ7GpO+PSLzlo=
 github.com/skycoin/yamux v0.0.0-20200803175205-571ceb89da9f h1:A5dEM1OE9YhN3LciZU9qPjo7fJ46JeHNi3JCroDkK0Y=

diff --git a/pkg/servicedisc/types.go b/pkg/servicedisc/types.go
@@ -124,6 +124,14 @@ type Service struct {
 	Geo       *geo.LocationData `json:"geo,omitempty" gorm:"embedded"`
 	Version   string            `json:"version,omitempty"`
 	LocalIPs  pq.StringArray    `json:"local_ips,omitempty" gorm:"type:text[]"`
+	Info      VPNInfo           `json:"info,omitempty" gorm:"-"`
+}
+
+// VPNInfo used for showing VPN metrics info, like latency, uptime and count of connections
+type VPNInfo struct {
+	Latency     float64
+	Uptime      float64
+	Connections int
 }
 
 // MarshalBinary implements encoding.BinaryMarshaller

diff --git a/vendor/github.com/skycoin/skywire-utilities/pkg/geo/geo.go b/vendor/github.com/skycoin/skywire-utilities/pkg/geo/geo.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -202,7 +202,7 @@ github.com/skycoin/skycoin/src/cipher/ripemd160
 github.com/skycoin/skycoin/src/cipher/secp256k1-go
 github.com/skycoin/skycoin/src/cipher/secp256k1-go/secp256k1-go2
 github.com/skycoin/skycoin/src/util/logging
-# github.com/skycoin/skywire-utilities v0.0.0-20220712142443-abafa30105ce
+# github.com/skycoin/skywire-utilities v0.0.0-20220812192633-7137eb730383
 ## explicit; go 1.17
 github.com/skycoin/skywire-utilities/pkg/buildinfo
 github.com/skycoin/skywire-utilities/pkg/cipher