gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-10-12 07:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix host mode service poll and update changelog and deps. Fixes #170

Browse Source
This commit is contained in:
Paul Lorenz
2021-05-12 15:15:08 -04:00
parent cc7c94eff3
commit edac1fd8c3
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+8 -1
View File
@@ -1,3 +1,10 @@
# Release 0.20.1
## What's New
* Fix bug in sdk which could cause panic by return nil connection and nil error
* [ziti#170](https://github.com/openziti/ziti/issues/170) Fix service poll refresh default for ziti-tunnel host mode
# Release 0.20.0
## What's New
@@ -466,4 +473,4 @@ Version 0.20 and later report:
"meta": {}
}.
```
```
go.mod
+2 -2
View File
@@ -27,10 +27,10 @@ require (
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d
github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19
github.com/michaelquigley/pfxlog v0.3.7
github.com/openziti/edge v0.19.110
github.com/openziti/edge v0.19.111
github.com/openziti/fabric v0.16.61
github.com/openziti/foundation v0.15.50
github.com/openziti/sdk-golang v0.15.47
github.com/openziti/sdk-golang v0.15.48
github.com/pborman/uuid v1.2.0
github.com/pkg/errors v0.9.1
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0
go.sum
+4 -4
View File
@@ -615,14 +615,14 @@ github.com/openziti/bbolt v1.3.6-0.20210317142109-547da822475e h1:ST9+54UtCr96S5
github.com/openziti/bbolt v1.3.6-0.20210317142109-547da822475e/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
github.com/openziti/dilithium v0.3.3 h1:PLgQ6PMNLSTzCFbX/h98cmudgz/cU6TmjdSv5NAPD8k=
github.com/openziti/dilithium v0.3.3/go.mod h1:vsCjI2AU/hon9e+dLhUFbCNGesJDj2ASgkySOcpmvjo=
github.com/openziti/edge v0.19.110 h1:YfO0LALYDq/C3cfcd0GXsT/N+HelKZTL81+z8oGrW8I=
github.com/openziti/edge v0.19.110/go.mod h1:us0jeq6JzGMl47FEVNN35WKlD5qPkSr0u7+kaw9oVQU=
github.com/openziti/edge v0.19.111 h1:4giPRy6CIlTp8Jqvq07tyt0pmCmswEClAr0pP+u9Y+w=
github.com/openziti/edge v0.19.111/go.mod h1:iUKYo5AmtkdrtDA08D9METZhMUqgEjx7ahUP+oNxbf0=
github.com/openziti/fabric v0.16.61 h1:NtEi9orFtieYPNx6H/XcRHAde1pQKW0gtEov8bsc2aA=
github.com/openziti/fabric v0.16.61/go.mod h1:xro2eGr6ilDmz8qZ0sp7KjHMl0KU4l9aOBydGF/tg9E=
github.com/openziti/foundation v0.15.50 h1:xvID5CAXNLAb0h9nOXCQr4PlcxlPpnPOnNDoEeyl424=
github.com/openziti/foundation v0.15.50/go.mod h1:NnSBTp9ZkcYsv6nYxZR0/NzoHfkIo6tjpBHDvBsPFqw=
github.com/openziti/sdk-golang v0.15.47 h1:6/VUergS4cWcmz4xAn45Q/aTC99steFWsLs3TLdk2Rk=
github.com/openziti/sdk-golang v0.15.47/go.mod h1:T68tkxqOwwcZhzfRjxSK26xe0eWsQ3VeLqi3cLCzQ0M=
github.com/openziti/sdk-golang v0.15.48 h1:dDJOjv5LgRR30GYFLtmpYkB8LJCWlO44ji8EX02PmEY=
github.com/openziti/sdk-golang v0.15.48/go.mod h1:T68tkxqOwwcZhzfRjxSK26xe0eWsQ3VeLqi3cLCzQ0M=
github.com/oracle/oci-go-sdk v24.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231 h1:fa50YL1pzKW+1SsBnJDOHppJN9stOEwS+CRWyUtyYGU=
ziti-tunnel/cmd/ziti-tunnel/subcmd/host.go
-6
View File
@@ -19,8 +19,6 @@ package subcmd
import (
"github.com/openziti/edge/tunnel/intercept/host"
"github.com/spf13/cobra"
"math"
"strconv"
)
var runHostCmd = &cobra.Command{
@@ -37,10 +35,6 @@ func init() {
}
func runHost(_ *cobra.Command, args []string) error {
// Fiddle with the poll rate and resolver settings if the user didn't wan't anything special.
if !root.Flag(svcPollRateFlag).Changed {
_ = root.PersistentFlags().Set(svcPollRateFlag, strconv.FormatUint(math.MaxUint32, 10))
}
if !root.Flag(resolverCfgFlag).Changed {
_ = root.PersistentFlags().Set(resolverCfgFlag, "")
}
ziti-tunnel/cmd/ziti-tunnel/subcmd/root.go
+1 -1
View File
@@ -43,7 +43,7 @@ const (
func init() {
root.PersistentFlags().BoolP("verbose", "v", false, "Enable verbose mode")
root.PersistentFlags().StringP("identity", "i", "", "Path to JSON file that contains an enrolled identity")
root.PersistentFlags().Uint(svcPollRateFlag, 15, "Set poll rate for service updates (seconds)")
root.PersistentFlags().Uint(svcPollRateFlag, 15, "Set poll rate for service updates (seconds). Polling in proxy mode is disabled unless this value is explicitly set")
root.PersistentFlags().StringP(resolverCfgFlag, "r", "udp://127.0.0.1:53", "Resolver configuration")
root.PersistentFlags().StringVar(&logFormatter, "log-formatter", "", "Specify log formatter [json|pfxlog|text]")
root.PersistentFlags().StringP(dnsSvcIpRangeFlag, "d", "100.64.0.1/10", "cidr to use when assigning IPs to unresolvable intercept hostnames")