IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename AddEventListenerCtx to AddEventListener and PublishCtx to Publish (#43566)

Browse Source
This commit is contained in:
idafurjes
2022-01-04 09:36:01 +01:00
committed by GitHub
parent a0cf57b5b8
commit 65e60759fb
8 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/bus/bus.go
View File

@@ -29,7 +29,7 @@ type TransactionManager interface {
type Bus interface {
Dispatch(ctx context.Context, msg Msg) error
PublishCtx(ctx context.Context, msg Msg) error
Publish(ctx context.Context, msg Msg) error
// InTransaction starts a transaction and store it in the context.
// The caller can then pass a function with multiple DispatchCtx calls that
@@ -39,7 +39,7 @@ type Bus interface {
AddHandler(handler HandlerFunc)
AddEventListenerCtx(handler HandlerFunc)
AddEventListener(handler HandlerFunc)
// SetTransactionManager allows the user to replace the internal
// noop TransactionManager that is responsible for managing
@@ -127,7 +127,7 @@ func (b *InProcBus) Dispatch(ctx context.Context, msg Msg) error {
}
// PublishCtx function publish a message to the bus listener.
func (b *InProcBus) PublishCtx(ctx context.Context, msg Msg) error {
func (b *InProcBus) Publish(ctx context.Context, msg Msg) error {
var msgName = reflect.TypeOf(msg).Elem().Name()
var params = []reflect.Value{}
@@ -183,7 +183,7 @@ func (b *InProcBus) GetHandlerCtx(name string) HandlerFunc {
return b.handlersWithCtx[name]
}
func (b *InProcBus) AddEventListenerCtx(handler HandlerFunc) {
func (b *InProcBus) AddEventListener(handler HandlerFunc) {
handlerType := reflect.TypeOf(handler)
eventName := handlerType.In(1).Elem().Name()
_, exists := b.listenersWithCtx[eventName]
@@ -201,16 +201,16 @@ func AddHandler(implName string, handler HandlerFunc) {
// AddEventListenerCtx attaches a handler function to the event listener.
// Package level function.
func AddEventListenerCtx(handler HandlerFunc) {
globalBus.AddEventListenerCtx(handler)
func AddEventListener(handler HandlerFunc) {
globalBus.AddEventListener(handler)
}
func Dispatch(ctx context.Context, msg Msg) error {
return globalBus.Dispatch(ctx, msg)
}
func PublishCtx(ctx context.Context, msg Msg) error {
return globalBus.PublishCtx(ctx, msg)
func Publish(ctx context.Context, msg Msg) error {
return globalBus.Publish(ctx, msg)
}
func GetHandlerCtx(name string) HandlerFunc {

20
pkg/bus/bus_test.go
View File

@@ -127,12 +127,12 @@ func TestEventPublish(t *testing.T) {
var invoked bool
bus.AddEventListenerCtx(func(ctx context.Context, query *testQuery) error {
bus.AddEventListener(func(ctx context.Context, query *testQuery) error {
invoked = true
return nil
})
err := bus.PublishCtx(context.Background(), &testQuery{})
err := bus.Publish(context.Background(), &testQuery{})
require.NoError(t, err, "unable to publish event")
require.True(t, invoked)
@@ -141,7 +141,7 @@ func TestEventPublish(t *testing.T) {
func TestEventPublish_NoRegisteredListener(t *testing.T) {
bus := New()
err := bus.PublishCtx(context.Background(), &testQuery{})
err := bus.Publish(context.Background(), &testQuery{})
require.NoError(t, err, "unable to publish event")
}
@@ -150,12 +150,12 @@ func TestEventCtxPublishCtx(t *testing.T) {
var invoked bool
bus.AddEventListenerCtx(func(ctx context.Context, query *testQuery) error {
bus.AddEventListener(func(ctx context.Context, query *testQuery) error {
invoked = true
return nil
})
err := bus.PublishCtx(context.Background(), &testQuery{})
err := bus.Publish(context.Background(), &testQuery{})
require.NoError(t, err, "unable to publish event")
require.True(t, invoked)
@@ -164,7 +164,7 @@ func TestEventCtxPublishCtx(t *testing.T) {
func TestEventPublishCtx_NoRegisteredListener(t *testing.T) {
bus := New()
err := bus.PublishCtx(context.Background(), &testQuery{})
err := bus.Publish(context.Background(), &testQuery{})
require.NoError(t, err, "unable to publish event")
}
@@ -173,12 +173,12 @@ func TestEventPublishCtx(t *testing.T) {
var invoked bool
bus.AddEventListenerCtx(func(ctx context.Context, query *testQuery) error {
bus.AddEventListener(func(ctx context.Context, query *testQuery) error {
invoked = true
return nil
})
err := bus.PublishCtx(context.Background(), &testQuery{})
err := bus.Publish(context.Background(), &testQuery{})
require.NoError(t, err, "unable to publish event")
require.True(t, invoked)
@@ -189,12 +189,12 @@ func TestEventCtxPublish(t *testing.T) {
var invoked bool
bus.AddEventListenerCtx(func(ctx context.Context, query *testQuery) error {
bus.AddEventListener(func(ctx context.Context, query *testQuery) error {
invoked = true
return nil
})
err := bus.PublishCtx(context.Background(), &testQuery{})
err := bus.Publish(context.Background(), &testQuery{})
require.NoError(t, err, "unable to publish event")
require.True(t, invoked)