mirror of
https://github.com/openziti/ziti.git
synced 2026-10-13 07:41:17 +00:00
Merge pull request #254 from openziti/gh-253-fix-tunnel-enroll-status
Set non-zero exit code when ziti-tunnel enroll fails. Fixes GH-253
This commit is contained in:
+1329
-876
File diff suppressed because it is too large
Load Diff
@@ -32,8 +32,8 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
svcPollRateFlag = "svcPollRate"
|
||||
resolverCfgFlag = "resolver"
|
||||
svcPollRateFlag = "svcPollRate"
|
||||
resolverCfgFlag = "resolver"
|
||||
dnsSvcIpRangeFlag = "dnsSvcIpRange"
|
||||
)
|
||||
|
||||
@@ -61,6 +61,7 @@ var logFormatter string
|
||||
func Execute() {
|
||||
if err := root.Execute(); err != nil {
|
||||
pfxlog.Logger().Errorf("error: %s", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -103,7 +104,8 @@ func rootPostRun(cmd *cobra.Command, _ []string) {
|
||||
resolverConfig := cmd.Flag("resolver").Value.String()
|
||||
resolver = dns.NewResolver(resolverConfig)
|
||||
dnsIpRange, _ := cmd.Flags().GetString(dnsSvcIpRangeFlag)
|
||||
err = intercept.SetDnsInterceptIpRange(dnsIpRange); if err != nil {
|
||||
err = intercept.SetDnsInterceptIpRange(dnsIpRange)
|
||||
if err != nil {
|
||||
log.Fatalf("invalid dns service IP range %s: %v", dnsIpRange, err)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user