public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use warningf instead of warnf

This commit is contained in:
Murat Kabilov 2017-08-30 14:35:56 +02:00 committed by GitHub
parent a987ff39a7
commit 899c0bef45
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apiserver/apiserver.go
View File

@ -101,7 +101,7 @@ func (s *Server) Run(stopCh <-chan struct{}, wg *sync.WaitGroup) {
defer cancel() defer cancel()
err := s.http.Shutdown(ctx) err := s.http.Shutdown(ctx)
if err == context.DeadlineExceeded { if err == context.DeadlineExceeded {
s.logger.Warnf("Shutdown timeout exceeded. closing http server") s.logger.Warningf("Shutdown timeout exceeded. closing http server")
s.http.Close() s.http.Close()
} else if err != nil { } else if err != nil {
s.logger.Errorf("Could not shutdown http server: %v", err) s.logger.Errorf("Could not shutdown http server: %v", err)

4
pkg/cluster/cluster.go
View File

@ -294,7 +294,7 @@ func (c *Cluster) compareStatefulSetWith(statefulSet *v1beta1.StatefulSet) *comp
} }
if len(c.Statefulset.Spec.Template.Spec.Containers) == 0 { if len(c.Statefulset.Spec.Template.Spec.Containers) == 0 {
c.logger.Warnf("statefulset %q has no container", util.NameFromMeta(c.Statefulset.ObjectMeta)) c.logger.Warningf("statefulset %q has no container", util.NameFromMeta(c.Statefulset.ObjectMeta))
return &compareStatefulsetResult{} return &compareStatefulsetResult{}
} }
// In the comparisons below, the needsReplace and needsRollUpdate flags are never reset, since checks fall through // In the comparisons below, the needsReplace and needsRollUpdate flags are never reset, since checks fall through
@ -479,7 +479,7 @@ func (c *Cluster) Update(newSpec *spec.Postgresql) error {
} }
if c.Spec.PgVersion != newSpec.Spec.PgVersion { // PG versions comparison if c.Spec.PgVersion != newSpec.Spec.PgVersion { // PG versions comparison
c.logger.Warnf("postgresql version change(%q -> %q) is not allowed", c.logger.Warningf("postgresql version change(%q -> %q) is not allowed",
c.Spec.PgVersion, newSpec.Spec.PgVersion) c.Spec.PgVersion, newSpec.Spec.PgVersion)
//TODO: rewrite pg version in tpr spec //TODO: rewrite pg version in tpr spec
} }

2
pkg/cluster/k8sres.go
View File

@ -145,7 +145,7 @@ PATRONI_INITDB_PARAMS:
} }
} }
default: default:
c.logger.Warnf("unsupported type for initdb configuration item %s: %T", defaultParam, defaultParam) c.logger.Warningf("unsupported type for initdb configuration item %s: %T", defaultParam, defaultParam)
continue PATRONI_INITDB_PARAMS continue PATRONI_INITDB_PARAMS
} }
} }

2
pkg/cluster/resources.go
View File

@ -199,7 +199,7 @@ func (c *Cluster) replaceStatefulSet(newStatefulSet *v1beta1.StatefulSet) error
// check that all the previous replicas were picked up. // check that all the previous replicas were picked up.
if newStatefulSet.Spec.Replicas == oldStatefulset.Spec.Replicas && if newStatefulSet.Spec.Replicas == oldStatefulset.Spec.Replicas &&
createdStatefulset.Status.Replicas != oldStatefulset.Status.Replicas { createdStatefulset.Status.Replicas != oldStatefulset.Status.Replicas {
c.logger.Warnf("number of pods for the old and updated Statefulsets is not identical") c.logger.Warningf("number of pods for the old and updated Statefulsets is not identical")
} }
c.Statefulset = createdStatefulset c.Statefulset = createdStatefulset

2
pkg/controller/util.go
View File

@ -99,7 +99,7 @@ Users:
case "inrole": case "inrole":
t.MemberOf = append(t.MemberOf, s) t.MemberOf = append(t.MemberOf, s)
default: default:
c.logger.Warnf("unknown key %q", p) c.logger.Warningf("unknown key %q", p)
} }
} }
} }