Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix typo #479

Merged
merged 1 commit into from
Jan 25, 2022
Merged

fix typo #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/object/autocertmanager/autocertmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ func (acm *AutoCertManager) renew() bool {
if err := d.renewCert(acm); err == nil {
logger.Infof("certificate for domain %s has been renewed", d.Name)
} else {
logger.Errorf("failed to renew cerficate for domain %s: %v", d.Name, err)
logger.Errorf("failed to renew certificate for domain %s: %v", d.Name, err)
allSucc = false
}
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/object/meshcontroller/master/master.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ type (
superSpec *supervisor.Spec
spec *spec.Admin
heartbeatInterval time.Duration
certMananger *certmanager.CertManager
certManager *certmanager.CertManager

registrySyncer *registrySyncer
store storage.Storage
Expand Down Expand Up @@ -102,7 +102,7 @@ func (m *Master) initMTLS() error {
return err
}

m.certMananger = certmanager.NewCertManager(m.superSpec, m.service, m.spec.Security.CertProvider, appCertTTL, rootCertTTL, m.store)
m.certManager = certmanager.NewCertManager(m.superSpec, m.service, m.spec.Security.CertProvider, appCertTTL, rootCertTTL, m.store)

return nil
}
Expand All @@ -124,7 +124,7 @@ func (m *Master) run() {
}
}

// only handle master routines when its the cluster leader.
// only handle master routines when it's the cluster leader.
func (m *Master) needHandle() bool {
return m.superSpec.Super().Cluster().IsLeader()
}
Expand Down Expand Up @@ -242,7 +242,7 @@ func (m *Master) updateInstanceStatus(_spec *spec.ServiceInstanceSpec, status st
// Close closes the master
func (m *Master) Close() {
if m.spec.EnablemTLS() {
m.certMananger.Close()
m.certManager.Close()
}
close(m.done)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/option/option.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func (opt *Options) UseInitialCluster() bool {
func (opt *Options) renameLegacyClusterRoles() {
warning := "Cluster roles writer/reader are deprecated. \n" +
"Renamed cluster role '%s' to '%s'. Please use primary/secondary instead. \n"
fmtLogger := fmt.Printf // Importing logger here is a import cycle, so use fmt instead.
fmtLogger := fmt.Printf // Importing logger here is an import cycle, so use fmt instead.
if opt.ClusterRole == "writer" {
opt.ClusterRole = "primary"
fmtLogger(warning, "writer", "primary")
Expand Down