From dea283df27412226d2a30118aea6891803cf485f Mon Sep 17 00:00:00 2001 From: "Alexander \"Arav\" Andreev" Date: Sun, 1 Oct 2023 20:32:07 +0400 Subject: [PATCH] Listeners struct was renamed to ListenerCounter. --- cmd/dwelling-radiodj/main.go | 2 +- internal/http/dj_handlers.go | 4 ++-- internal/radio/listeners.go | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmd/dwelling-radiodj/main.go b/cmd/dwelling-radiodj/main.go index 164f89e..16df62d 100644 --- a/cmd/dwelling-radiodj/main.go +++ b/cmd/dwelling-radiodj/main.go @@ -37,7 +37,7 @@ func main() { r := httpr.New() - lstnrs := radio.NewListeners() + lstnrs := radio.NewListenerCounter() plylst, err := radio.NewPlaylist(*playlist, true) if err != nil { log.Fatalln(err) diff --git a/internal/http/dj_handlers.go b/internal/http/dj_handlers.go index 402cc25..0562440 100644 --- a/internal/http/dj_handlers.go +++ b/internal/http/dj_handlers.go @@ -14,11 +14,11 @@ import ( var songList radio.SongList type DJHandlers struct { - listeners *radio.Listeners + listeners *radio.ListenerCounter playlist *radio.Playlist } -func NewDJHandlers(l *radio.Listeners, p *radio.Playlist, slLen int) *DJHandlers { +func NewDJHandlers(l *radio.ListenerCounter, p *radio.Playlist, slLen int) *DJHandlers { songList = *radio.NewSongList(slLen) return &DJHandlers{listeners: l, playlist: p} } diff --git a/internal/radio/listeners.go b/internal/radio/listeners.go index f213612..9b0ee5a 100644 --- a/internal/radio/listeners.go +++ b/internal/radio/listeners.go @@ -7,33 +7,33 @@ import ( "sync" ) -// Listeners stores the current and peak numbers of listeners. -type Listeners struct { +// ListenerCounter stores the current and peak numbers of listeners. +type ListenerCounter struct { mut sync.Mutex current, peak int } -// NewListeners returns a new Listeners struct instance. -func NewListeners() *Listeners { - return &Listeners{} +// NewListenerCounter returns a new ListenerCounter struct instance. +func NewListenerCounter() *ListenerCounter { + return &ListenerCounter{} } // Current returns a number of current listeners. -func (l *Listeners) Current() int { +func (l *ListenerCounter) Current() int { l.mut.Lock() defer l.mut.Unlock() return l.current } // Current returns a number of peak listeners. -func (l *Listeners) Peak() int { +func (l *ListenerCounter) Peak() int { l.mut.Lock() defer l.mut.Unlock() return l.peak } // Inc increments by 1 a current number of listeners and updates a peak number. -func (l *Listeners) Inc() int { +func (l *ListenerCounter) Inc() int { l.mut.Lock() defer l.mut.Unlock() if l.current == math.MaxInt { @@ -49,7 +49,7 @@ func (l *Listeners) Inc() int { // Dec decrements by 1 a current number of listeners. An error will occur if // a resulting number is less than 0. -func (l *Listeners) Dec() (int, error) { +func (l *ListenerCounter) Dec() (int, error) { l.mut.Lock() defer l.mut.Unlock() if l.current == 0 {