8000 Fix logger by josedonizetti · Pull Request #3092 · aquasecurity/tracee · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix logger #3092

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 3 commits into from
May 12, 2023
Merged

Fix logger #3092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
807a860
fix: logger should be the first to initialiaze
josedonizetti May 10, 2023
75c420c
chore: remove todo
josedonizetti May 10, 2023
afb3b36
refactor: remove if not needed
josedonizetti May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to 8000
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions cmd/tracee/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,6 @@ func initCmd() error {

// Server flags

// TODO: add webhook

rootCmd.Flags().Bool(
server.MetricsEndpointFlag,
false,
Expand Down
18 changes: 10 additions & 8 deletions pkg/cmd/cobra/cobra.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@ import (
func GetTraceeRunner(c *cobra.Command, version string) (cmd.Runner, error) {
var runner cmd.Runner

// Log command line flags

// Logger initialization must be the first thing to be done,
// so all other packages can use it
logCfg, err := flags.PrepareLogger(viper.GetStringSlice("log"), true)
if err != nil {
return runner, err
}
logger.Init(logCfg)

// Rego command line flags

rego, err := flags.PrepareRego(viper.GetStringSlice("rego"))
Expand Down Expand Up @@ -67,14 +77,6 @@ func GetTraceeRunner(c *cobra.Command, version string) (cmd.Runner, error) {
}
cfg.Output = output.TraceeConfig

// Log command line flags

logCfg, err := flags.PrepareLogger(viper.GetStringSlice("log"), true)
if err != nil {
return runner, err
}
logger.Init(logCfg)

// OS release information

osInfo, err := helpers.GetOSInfo()
Expand Down
5 changes: 1 addition & 4 deletions pkg/cmd/tracee.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@ func (r Runner) Run(ctx context.Context) error {
// Decide if HTTP server should be started

if r.Server != nil {
if r.Server.MetricsEndpointEnabled() {
r.TraceeConfig.MetricsEnabled = true
}

r.TraceeConfig.MetricsEnabled = r.Server.MetricsEndpointEnabled()
go r.Server.Start(ctx)
}

Expand Down
0