Skip to content
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

Jump to bottom

fix #47 #35 #49

Merged
merged 2 commits into from
Jun 1, 2020
Merged

fix #47 #35 #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58dee76
avoid stacktrace on empty config, but I guess this could be improved
buixor Jun 1, 2020
a4b9a77
fix #47
buixor Jun 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions cmd/crowdsec-cli/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ func initConfig() {
/*read config*/
config.InstallFolder = filepath.Clean(csConfig.ConfigFolder)
config.HubFolder = filepath.Clean(config.configFolder + "/hub/")
if csConfig.OutputConfig == nil {
log.Fatalf("Missing backend plugin configuration in %s", config.ConfigFilePath)
}
config.BackendPluginFolder = filepath.Clean(csConfig.OutputConfig.BackendFolder)
config.DataFolder = filepath.Clean(csConfig.DataFolder)
//
Expand Down
4 changes: 2 additions & 2 deletions pkg/leakybucket/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ func LoadBuckets(files []string, dataFolder string) ([]BucketFactory, chan types
g.ret = response
err = LoadBucket(&g, dataFolder)
if err != nil {
log.Errorf("Failed to load bucket : %v", err)
return nil, nil, fmt.Errorf("loadBucket failed : %v", err)
log.Errorf("Failed to load bucket %s : %v", g.Name, err)
return nil, nil, fmt.Errorf("loading of %s failed : %v", g.Name, err)
}
ret = append(ret, g)
}
Expand Down