Merge pull request sorintlab#536 from sgotti/sentinel_fix_govet_1.11_error

sgotti · sgotti · commit 0e8e6a66b4bb · 2018-07-31T10:05:27.000+02:00
sentinel: fix govet 1.11 error
diff --git a/cmd/sentinel/cmd/sentinel.go b/cmd/sentinel/cmd/sentinel.go
@@ -935,7 +935,7 @@ func (s *Sentinel) updateCluster(cd *cluster.ClusterData, pis cluster.ProxiesInf
 				}
 			}
 		default:
-			return nil, fmt.Errorf("unknown init mode %q", clusterSpec.InitMode)
+			return nil, fmt.Errorf("unknown init mode %s", *cd.Cluster.DefSpec().InitMode)
 		}
 
 	case cluster.ClusterPhaseNormal:

Original file line number	Diff line number	Diff line change
`@@ -935,7 +935,7 @@ func (s Sentinel) updateCluster(cd cluster.ClusterData, pis cluster.ProxiesInf`
`935`	`935`	`}`
`936`	`936`	`}`
`937`	`937`	`default:`
`938`		`- return nil, fmt.Errorf("unknown init mode %q", clusterSpec.InitMode)`
	`938`	`+ return nil, fmt.Errorf("unknown init mode %s", *cd.Cluster.DefSpec().InitMode)`
`939`	`939`	`}`
`940`	`940`
`941`	`941`	`case cluster.ClusterPhaseNormal:`