Set logger level per package instead of doing this globally
This commit is contained in:
parent
8db44d6f18
commit
8268b07ad2
|
|
@ -61,8 +61,8 @@ type Cluster struct {
|
|||
mu sync.Mutex
|
||||
}
|
||||
|
||||
func New(cfg Config, pgSpec spec.Postgresql) *Cluster {
|
||||
lg := logrus.WithField("pkg", "cluster").WithField("cluster-name", pgSpec.Metadata.Name)
|
||||
func New(cfg Config, pgSpec spec.Postgresql, logger *logrus.Logger) *Cluster {
|
||||
lg := logger.WithField("pkg", "cluster").WithField("cluster-name", pgSpec.Metadata.Name)
|
||||
kubeResources := KubeResources{Secrets: make(map[types.UID]*v1.Secret)}
|
||||
|
||||
cluster := &Cluster{
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ func (c *Cluster) logPodChanges(pod *v1.Pod, statefulset *v1beta1.StatefulSet, r
|
|||
if len(pod.Spec.Containers) == 1 {
|
||||
podContainer := pod.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 != "" {
|
||||
c.logger.Infof("Reason: %s", reason)
|
||||
|
|
|
|||
|
|
@ -39,15 +39,16 @@ type Controller struct {
|
|||
}
|
||||
|
||||
func New(controllerConfig *Config, operatorConfig *config.Config) *Controller {
|
||||
logger := logrus.New()
|
||||
|
||||
if operatorConfig.DebugLogging {
|
||||
logrus.SetLevel(logrus.DebugLevel)
|
||||
logger.Level = logrus.DebugLevel
|
||||
}
|
||||
logger := logrus.WithField("pkg", "controller")
|
||||
logger.Debugf("Debug output enabled")
|
||||
|
||||
return &Controller{
|
||||
Config: *controllerConfig,
|
||||
opConfig: operatorConfig,
|
||||
logger: logger,
|
||||
logger: logger.WithField("pkg", "controller"),
|
||||
clusters: make(map[spec.ClusterName]*cluster.Cluster),
|
||||
stopChMap: make(map[spec.ClusterName]chan struct{}),
|
||||
podCh: make(chan spec.PodEvent),
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ func (c *Controller) clusterListFunc(options api.ListOptions) (runtime.Object, e
|
|||
Name: pg.Metadata.Name,
|
||||
}
|
||||
|
||||
cl := cluster.New(clusterConfig, *pg)
|
||||
cl := cluster.New(clusterConfig, *pg, c.logger.Logger)
|
||||
|
||||
stopCh := make(chan struct{})
|
||||
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)
|
||||
cl := cluster.New(c.makeClusterConfig(), *pg)
|
||||
cl := cluster.New(c.makeClusterConfig(), *pg, c.logger.Logger)
|
||||
cl.SetStatus(spec.ClusterStatusCreating)
|
||||
if err := cl.Create(); err != nil {
|
||||
c.logger.Errorf("Can't create cluster: %s", err)
|
||||
|
|
|
|||
Loading…
Reference in New Issue