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

Set logger level per package instead of doing this globally

This commit is contained in:
Oleksii Kliukin 2017-04-06 16:22:13 +02:00 committed by Murat Kabilov
parent 8db44d6f18
commit 8268b07ad2
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cluster/cluster.go
View File

@ -61,8 +61,8 @@ type Cluster struct {
mu sync.Mutex mu sync.Mutex
} }
func New(cfg Config, pgSpec spec.Postgresql) *Cluster { func New(cfg Config, pgSpec spec.Postgresql, logger *logrus.Logger) *Cluster {
lg := logrus.WithField("pkg", "cluster").WithField("cluster-name", pgSpec.Metadata.Name) lg := logger.WithField("pkg", "cluster").WithField("cluster-name", pgSpec.Metadata.Name)
kubeResources := KubeResources{Secrets: make(map[types.UID]*v1.Secret)} kubeResources := KubeResources{Secrets: make(map[types.UID]*v1.Secret)}
cluster := &Cluster{ cluster := &Cluster{

2
pkg/cluster/util.go
View File

@ -129,7 +129,7 @@ func (c *Cluster) logPodChanges(pod *v1.Pod, statefulset *v1beta1.StatefulSet, r
if len(pod.Spec.Containers) == 1 { if len(pod.Spec.Containers) == 1 {
podContainer := pod.Spec.Containers[0] podContainer := pod.Spec.Containers[0]
templateContainer := statefulset.Spec.Template.Spec.Containers[0] templateContainer := statefulset.Spec.Template.Spec.Containers[0]
c.logger.Debugf("diff\n%s", util.PrettyDiff(podContainer, templateContainer)) c.logger.Debugf("diff pod <-> statefulset\n%s", util.PrettyDiff(podContainer, templateContainer))
} }
if reason != "" { if reason != "" {
c.logger.Infof("Reason: %s", reason) c.logger.Infof("Reason: %s", reason)

9
pkg/controller/controller.go
View File

@ -39,15 +39,16 @@ type Controller struct {
} }
func New(controllerConfig *Config, operatorConfig *config.Config) *Controller { func New(controllerConfig *Config, operatorConfig *config.Config) *Controller {
logger := logrus.New()
if operatorConfig.DebugLogging { if operatorConfig.DebugLogging {
logrus.SetLevel(logrus.DebugLevel) logger.Level = logrus.DebugLevel
} }
logger := logrus.WithField("pkg", "controller")
logger.Debugf("Debug output enabled")
return &Controller{ return &Controller{
Config: *controllerConfig, Config: *controllerConfig,
opConfig: operatorConfig, opConfig: operatorConfig,
logger: logger, logger: logger.WithField("pkg", "controller"),
clusters: make(map[spec.ClusterName]*cluster.Cluster), clusters: make(map[spec.ClusterName]*cluster.Cluster),
stopChMap: make(map[spec.ClusterName]chan struct{}), stopChMap: make(map[spec.ClusterName]chan struct{}),
podCh: make(chan spec.PodEvent), podCh: make(chan spec.PodEvent),

4
pkg/controller/postgresql.go
View File

@ -46,7 +46,7 @@ func (c *Controller) clusterListFunc(options api.ListOptions) (runtime.Object, e
Name: pg.Metadata.Name, Name: pg.Metadata.Name,
} }
cl := cluster.New(clusterConfig, *pg) cl := cluster.New(clusterConfig, *pg, c.logger.Logger)
stopCh := make(chan struct{}) stopCh := make(chan struct{})
c.stopChMap[clusterName] = stopCh c.stopChMap[clusterName] = stopCh
@ -95,7 +95,7 @@ func (c *Controller) postgresqlAdd(obj interface{}) {
} }
c.logger.Infof("Creation of a new Postgresql cluster '%s' started", clusterName) c.logger.Infof("Creation of a new Postgresql cluster '%s' started", clusterName)
cl := cluster.New(c.makeClusterConfig(), *pg) cl := cluster.New(c.makeClusterConfig(), *pg, c.logger.Logger)
cl.SetStatus(spec.ClusterStatusCreating) cl.SetStatus(spec.ClusterStatusCreating)
if err := cl.Create(); err != nil { if err := cl.Create(); err != nil {
c.logger.Errorf("Can't create cluster: %s", err) c.logger.Errorf("Can't create cluster: %s", err)