From 32e8f08b8d475abe63c4430860a72e856491d9dc Mon Sep 17 00:00:00 2001 From: Juliusz Chroboczek Date: Sat, 30 May 2020 12:38:13 +0200 Subject: [PATCH] Move dead errors into webclient. --- group.go | 12 ------------ webclient.go | 7 +++++-- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/group.go b/group.go index ccbcdd9..53d56ae 100644 --- a/group.go +++ b/group.go @@ -315,18 +315,6 @@ func (g *group) getChatHistory() []chatHistoryEntry { return h } -type writerDeadError int - -func (err writerDeadError) Error() string { - return "client writer died" -} - -type clientDeadError int - -func (err clientDeadError) Error() string { - return "client dead" -} - type groupUser struct { Username string `json:"username,omitempty"` Password string `json:"password,omitempty"` diff --git a/webclient.go b/webclient.go index 634f6fc..2cff5a2 100644 --- a/webclient.go +++ b/webclient.go @@ -1732,12 +1732,15 @@ func clientWriter(conn *websocket.Conn, ch <-chan interface{}, done chan<- struc } } +var ErrWriterDead = errors.New("client writer died") +var ErrClientDead = errors.New("client dead") + func (c *webClient) action(m interface{}) error { select { case c.actionCh <- m: return nil case <-c.done: - return clientDeadError(0) + return ErrClientDead } } @@ -1746,7 +1749,7 @@ func (c *webClient) write(m clientMessage) error { case c.writeCh <- m: return nil case <-c.writerDone: - return writerDeadError(0) + return ErrWriterDead } }