mirrors/crowdsec
1
0
Fork 0
mirror of https://github.com/crowdsecurity/crowdsec.git synced 2025-05-11 12:25:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

context propagation: pkg/database/config (#3246)

Browse source
This commit is contained in:
mmetc 2024-09-19 14:09:35 +02:00 • committed by GitHub
parent b4a2403fdf
commit eeb28014c6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 59 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pkg/apiserver/apiserver.go
View file

@ -310,8 +310,8 @@ func (s *APIServer) apicPush() error {
return nil
}
func (s *APIServer) apicPull() error {
if err := s.apic.Pull(); err != nil {
func (s *APIServer) apicPull(ctx context.Context) error {
if err := s.apic.Pull(ctx); err != nil {
log.Errorf("capi pull: %s", err)
return err
}
@ -319,8 +319,8 @@ func (s *APIServer) apicPull() error {
return nil
}
func (s *APIServer) papiPull() error {
if err := s.papi.Pull(); err != nil {
func (s *APIServer) papiPull(ctx context.Context) error {
if err := s.papi.Pull(ctx); err != nil {
log.Errorf("papi pull: %s", err)
return err
}
@ -337,16 +337,16 @@ func (s *APIServer) papiSync() error {
return nil
}
func (s *APIServer) initAPIC() {
func (s *APIServer) initAPIC(ctx context.Context) {
s.apic.pushTomb.Go(s.apicPush)
s.apic.pullTomb.Go(s.apicPull)
s.apic.pullTomb.Go(func() error { return s.apicPull(ctx) })
// csConfig.API.Server.ConsoleConfig.ShareCustomScenarios
if s.apic.apiClient.IsEnrolled() {
if s.consoleConfig.IsPAPIEnabled() {
if s.papi.URL != "" {
log.Info("Starting PAPI decision receiver")
s.papi.pullTomb.Go(s.papiPull)
s.papi.pullTomb.Go(func() error { return s.papiPull(ctx) })
s.papi.syncTomb.Go(s.papiSync)
} else {
log.Warnf("papi_url is not set in online_api_credentials.yaml, can't synchronize with the console. Run cscli console enable console_management to add it.")
@ -381,8 +381,10 @@ func (s *APIServer) Run(apiReady chan bool) error {
TLSConfig: tlsCfg,
}
ctx := context.TODO()
if s.apic != nil {
s.initAPIC()
s.initAPIC(ctx)
}
s.httpServerTomb.Go(func() error {