Suppress event broker not started log warning (#19593)
This commit is contained in:
parent
6fbf3da148
commit
f1f5c8444a
|
@ -0,0 +1,4 @@
|
|||
```release-note:improvement
|
||||
events: Suppress log warnings triggered when events are sent but the events system is not enabled.
|
||||
```
|
||||
|
|
@ -37,6 +37,10 @@ type GRPCEventsServer struct {
|
|||
}
|
||||
|
||||
func (s *GRPCEventsServer) SendEvent(ctx context.Context, req *pb.SendEventRequest) (*pb.Empty, error) {
|
||||
if s.impl == nil {
|
||||
return &pb.Empty{}, nil
|
||||
}
|
||||
|
||||
err := s.impl.Send(ctx, logical.EventType(req.EventType), req.Event)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
|
|
@ -13,6 +13,7 @@ import (
|
|||
"github.com/hashicorp/go-secure-stdlib/strutil"
|
||||
"github.com/hashicorp/go-uuid"
|
||||
"github.com/hashicorp/vault/builtin/plugin"
|
||||
"github.com/hashicorp/vault/helper/experiments"
|
||||
"github.com/hashicorp/vault/helper/namespace"
|
||||
"github.com/hashicorp/vault/helper/versions"
|
||||
"github.com/hashicorp/vault/sdk/helper/consts"
|
||||
|
@ -1004,12 +1005,14 @@ func (c *Core) newCredentialBackend(ctx context.Context, entry *MountEntry, sysV
|
|||
}
|
||||
|
||||
config := &logical.BackendConfig{
|
||||
StorageView: view,
|
||||
Logger: authLogger,
|
||||
Config: conf,
|
||||
System: sysView,
|
||||
BackendUUID: entry.BackendAwareUUID,
|
||||
EventsSender: pluginEventSender,
|
||||
StorageView: view,
|
||||
Logger: authLogger,
|
||||
Config: conf,
|
||||
System: sysView,
|
||||
BackendUUID: entry.BackendAwareUUID,
|
||||
}
|
||||
if c.IsExperimentEnabled(experiments.VaultExperimentEventsAlpha1) {
|
||||
config.EventsSender = pluginEventSender
|
||||
}
|
||||
|
||||
b, err := f(ctx, config)
|
||||
|
|
|
@ -18,6 +18,7 @@ import (
|
|||
"github.com/hashicorp/go-secure-stdlib/strutil"
|
||||
"github.com/hashicorp/go-uuid"
|
||||
"github.com/hashicorp/vault/builtin/plugin"
|
||||
"github.com/hashicorp/vault/helper/experiments"
|
||||
"github.com/hashicorp/vault/helper/metricsutil"
|
||||
"github.com/hashicorp/vault/helper/namespace"
|
||||
"github.com/hashicorp/vault/helper/versions"
|
||||
|
@ -1663,12 +1664,14 @@ func (c *Core) newLogicalBackend(ctx context.Context, entry *MountEntry, sysView
|
|||
return nil, "", err
|
||||
}
|
||||
config := &logical.BackendConfig{
|
||||
StorageView: view,
|
||||
Logger: backendLogger,
|
||||
Config: conf,
|
||||
System: sysView,
|
||||
BackendUUID: entry.BackendAwareUUID,
|
||||
EventsSender: pluginEventSender,
|
||||
StorageView: view,
|
||||
Logger: backendLogger,
|
||||
Config: conf,
|
||||
System: sysView,
|
||||
BackendUUID: entry.BackendAwareUUID,
|
||||
}
|
||||
if c.IsExperimentEnabled(experiments.VaultExperimentEventsAlpha1) {
|
||||
config.EventsSender = pluginEventSender
|
||||
}
|
||||
|
||||
ctx = context.WithValue(ctx, "core_number", c.coreNumber)
|
||||
|
|
Loading…
Reference in New Issue