Skip to content

Commit 0a9ef99

Browse files
authored
Merge pull request kubernetes#83489 from yutedz/brocaster-shutdown
Expose Shutdown func for EventBroadcaster
2 parents 8098bae + 57d43e4 commit 0a9ef99

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

staging/src/k8s.io/client-go/tools/events/event_broadcaster.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ func newBroadcaster(sink EventSink, sleepDuration time.Duration, eventCache map[
102102
}
103103
}
104104

105+
func (e *eventBroadcasterImpl) Shutdown() {
106+
e.Broadcaster.Shutdown()
107+
}
108+
105109
// refreshExistingEventSeries refresh events TTL
106110
func (e *eventBroadcasterImpl) refreshExistingEventSeries() {
107111
// TODO: Investigate whether lock contention won't be a problem

staging/src/k8s.io/client-go/tools/events/interfaces.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ type EventBroadcaster interface {
5454
// NOTE: events received on your eventHandler should be copied before being used.
5555
// TODO: figure out if this can be removed.
5656
StartEventWatcher(eventHandler func(event runtime.Object)) func()
57+
58+
// Shutdown shuts down the broadcaster
59+
Shutdown()
5760
}
5861

5962
// EventSink knows how to store events (client-go implements it.)

staging/src/k8s.io/client-go/tools/record/event.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@ type EventBroadcaster interface {
127127
// NewRecorder returns an EventRecorder that can be used to send events to this EventBroadcaster
128128
// with the event source set to the given event source.
129129
NewRecorder(scheme *runtime.Scheme, source v1.EventSource) EventRecorder
130+
131+
// Shutdown shuts down the broadcaster
132+
Shutdown()
130133
}
131134

132135
// Creates a new event broadcaster.
@@ -169,6 +172,10 @@ func (eventBroadcaster *eventBroadcasterImpl) StartRecordingToSink(sink EventSin
169172
})
170173
}
171174

175+
func (e *eventBroadcasterImpl) Shutdown() {
176+
e.Broadcaster.Shutdown()
177+
}
178+
172179
func recordToSink(sink EventSink, event *v1.Event, eventCorrelator *EventCorrelator, sleepDuration time.Duration) {
173180
// Make a copy before modification, because there could be multiple listeners.
174181
// Events are safe to copy like this.

0 commit comments

Comments
 (0)