From 1cb7bff8b336c47aa9c00fe900285364ba03386c Mon Sep 17 00:00:00 2001 From: Qian Wang Date: Sun, 30 Dec 2018 00:28:38 +0000 Subject: [PATCH] Lexical changes --- internal/multiplex/session.go | 6 +++--- internal/server/usermanager/controller.go | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/internal/multiplex/session.go b/internal/multiplex/session.go index 40e23c3..929c83b 100644 --- a/internal/multiplex/session.go +++ b/internal/multiplex/session.go @@ -38,8 +38,8 @@ type Session struct { // For accepting new streams acceptCh chan *Stream - die chan struct{} - overdose sync.Once // fentanyl? beware of respiratory depression + die chan struct{} + suicide sync.Once } // 1 conn is needed to make a session @@ -146,7 +146,7 @@ func (sesh *Session) addStream(id uint32) *Stream { func (sesh *Session) Close() error { // Because closing a closed channel causes panic - sesh.overdose.Do(func() { close(sesh.die) }) + sesh.suicide.Do(func() { close(sesh.die) }) sesh.streamsM.Lock() for id, stream := range sesh.streams { // If we call stream.Close() here, streamsM will result in a deadlock diff --git a/internal/server/usermanager/controller.go b/internal/server/usermanager/controller.go index 5d6b1b1..62b423b 100644 --- a/internal/server/usermanager/controller.go +++ b/internal/server/usermanager/controller.go @@ -13,6 +13,8 @@ import ( // FIXME: sanity checks. The server may panic due to user input +// TODO: manual backup + /* 0 reserved 1 listActiveUsers none []uids