mirror of
https://github.com/gravitational/teleport
synced 2024-10-23 02:32:39 +00:00
Merge branch 'master' of github.com:gravitational/teleport
This commit is contained in:
commit
b277805874
|
@ -82,7 +82,7 @@ func InitLoggerForTests() {
|
|||
log.SetOutput(ioutil.Discard)
|
||||
}
|
||||
|
||||
// FatalError is for CLI front-ends: it detects gravitational.Trace debugging
|
||||
// FatalError is for CLI front-ends: it detects gravitational/trace debugging
|
||||
// information, sends it to the logger, strips it off and prints a clean message to stderr
|
||||
func FatalError(err error) {
|
||||
fmt.Fprintln(os.Stderr, UserMessageFromError(err))
|
||||
|
|
|
@ -716,11 +716,11 @@ func connectToAuthService(cfg *service.Config) (client *auth.TunClient, err erro
|
|||
return client, nil
|
||||
}
|
||||
|
||||
// validateConfig updtes&validates tctl configuration
|
||||
// validateConfig validates and updates tctl configuration
|
||||
func validateConfig(cfg *service.Config) {
|
||||
var err error
|
||||
// read or generate a host UUID for this node
|
||||
cfg.HostUUID, err = utils.ReadOrMakeHostUUID(cfg.DataDir)
|
||||
// read a host UUID for this node
|
||||
cfg.HostUUID, err = utils.ReadHostUUID(cfg.DataDir)
|
||||
if err != nil {
|
||||
utils.FatalError(err)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue