Skip to content

(Bugfix) Fix Operator Logger NPE #1011

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

Merged
merged 1 commit into from
Jun 14, 2022
Merged

(Bugfix) Fix Operator Logger NPE #1011

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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
- (Feature) OPS CLI with Arango Task
- (Bugfix) Allow ArangoBackup Creation during Upload state
- (Hotfix) Fix `ArangoDeployment` SubResource in CRD auto-installer
- (Bugfix) Fix Operator Logger NPE

## [1.2.13](https://github.com/arangodb/kube-arangodb/tree/1.2.13) (2022-06-07)
- (Bugfix) Fix arangosync members state inspection
Expand Down
7 changes: 7 additions & 0 deletions pkg/operator/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ const (
initRetryWaitTime = 30 * time.Second
)

var logger = logging.Global().RegisterAndGetLogger("operator", logging.Info)

type operatorV2type string

const (
Expand Down Expand Up @@ -129,6 +131,7 @@ func NewOperator(config Config, deps Dependencies) (*Operator, error) {
deploymentReplications: make(map[string]*replication.DeploymentReplication),
localStorages: make(map[string]*storage.LocalStorage),
}
o.log = logger.WrapObj(o)
return o, nil
}

Expand Down Expand Up @@ -311,3 +314,7 @@ func (o *Operator) onStartOperatorV2(operatorType operatorV2type, stop <-chan st

<-stop
}

func (o *Operator) WrapLogger(in *zerolog.Event) *zerolog.Event {
return in.Str("namespace", o.Namespace)
}