Dont fail config if agent opts is nil (#1898)
* Handle agentopts nil better * Add changes file
This commit is contained in:
@@ -0,0 +1 @@
|
||||
* Handle properly the case where the agent opts is nil in the app config.
|
||||
@@ -224,10 +224,13 @@ func (svc *Service) GetClientConfig(ctx context.Context) (map[string]interface{}
|
||||
return nil, osqueryError{message: "internal error: fetch base config: " + err.Error()}
|
||||
}
|
||||
|
||||
var config map[string]interface{}
|
||||
err = json.Unmarshal(baseConfig, &config)
|
||||
if err != nil {
|
||||
return nil, osqueryError{message: "internal error: parse base configuration: " + err.Error()}
|
||||
config := make(map[string]interface{})
|
||||
|
||||
if baseConfig != nil {
|
||||
err = json.Unmarshal(baseConfig, &config)
|
||||
if err != nil {
|
||||
return nil, osqueryError{message: "internal error: parse base configuration: " + err.Error()}
|
||||
}
|
||||
}
|
||||
|
||||
packs, err := svc.ds.ListPacksForHost(host.ID)
|
||||
|
||||
Reference in New Issue
Block a user