3pp-mirror/neko
1
0
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2025-07-30 15:00:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix logs, unified session_id.

Browse source
This commit is contained in:
Miroslav Šedivý 2021-03-13 23:27:28 +01:00
parent cacdd9e20a
commit d83e04e7ec
10 changed files with 37 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

30
internal/websocket/manager.go
View file

@ -46,49 +46,49 @@ type WebSocketManagerCtx struct {
func (manager *WebSocketManagerCtx) Start() {
manager.sessions.OnCreated(func(session types.Session) {
if err := manager.handler.SessionCreated(session); err != nil {
manager.logger.Warn().Str("id", session.ID()).Err(err).Msg("session created with an error")
manager.logger.Warn().Str("session_id", session.ID()).Err(err).Msg("session created with an error")
} else {
manager.logger.Debug().Str("id", session.ID()).Msg("session created")
manager.logger.Debug().Str("session_id", session.ID()).Msg("session created")
}
})
manager.sessions.OnDeleted(func(session types.Session) {
if err := manager.handler.SessionDeleted(session); err != nil {
manager.logger.Warn().Str("id", session.ID()).Err(err).Msg("session deleted with an error")
manager.logger.Warn().Str("session_id", session.ID()).Err(err).Msg("session deleted with an error")
} else {
manager.logger.Debug().Str("id", session.ID()).Msg("session deleted")
manager.logger.Debug().Str("session_id", session.ID()).Msg("session deleted")
}
})
manager.sessions.OnConnected(func(session types.Session) {
if err := manager.handler.SessionConnected(session); err != nil {
manager.logger.Warn().Str("id", session.ID()).Err(err).Msg("session connected with an error")
manager.logger.Warn().Str("session_id", session.ID()).Err(err).Msg("session connected with an error")
} else {
manager.logger.Debug().Str("id", session.ID()).Msg("session connected")
manager.logger.Debug().Str("session_id", session.ID()).Msg("session connected")
}
})
manager.sessions.OnDisconnected(func(session types.Session) {
if err := manager.handler.SessionDisconnected(session); err != nil {
manager.logger.Warn().Str("id", session.ID()).Err(err).Msg("session disconnected with an error")
manager.logger.Warn().Str("session_id", session.ID()).Err(err).Msg("session disconnected with an error")
} else {
manager.logger.Debug().Str("id", session.ID()).Msg("session disconnected")
manager.logger.Debug().Str("session_id", session.ID()).Msg("session disconnected")
}
})
manager.sessions.OnProfileChanged(func(session types.Session) {
if err := manager.handler.SessionProfileChanged(session); err != nil {
manager.logger.Warn().Str("id", session.ID()).Err(err).Msg("session profile changed with an error")
manager.logger.Warn().Str("session_id", session.ID()).Err(err).Msg("session profile changed with an error")
} else {
manager.logger.Debug().Str("id", session.ID()).Msg("session profile changed")
manager.logger.Debug().Str("session_id", session.ID()).Msg("session profile changed")
}
})
manager.sessions.OnStateChanged(func(session types.Session) {
if err := manager.handler.SessionStateChanged(session); err != nil {
manager.logger.Warn().Str("id", session.ID()).Err(err).Msg("session state changed with an error")
manager.logger.Warn().Str("session_id", session.ID()).Err(err).Msg("session state changed with an error")
} else {
manager.logger.Debug().Str("id", session.ID()).Msg("session state changed")
manager.logger.Debug().Str("session_id", session.ID()).Msg("session state changed")
}
})
@ -201,7 +201,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque
manager.logger.
Debug().
Str("session", session.ID()).
Str("session_id", session.ID()).
Str("address", connection.RemoteAddr().String()).
Msg("connection started")
@ -210,7 +210,7 @@ func (manager *WebSocketManagerCtx) Upgrade(w http.ResponseWriter, r *http.Reque
defer func() {
manager.logger.
Debug().
Str("session", session.ID()).
Str("session_id", session.ID()).
Str("address", connection.RemoteAddr().String()).
Msg("connection ended")
@ -250,7 +250,7 @@ func (manager *WebSocketManagerCtx) handle(connection *websocket.Conn, session t
select {
case raw := <-bytes:
manager.logger.Debug().
Str("session", session.ID()).
Str("session_id", session.ID()).
Str("address", connection.RemoteAddr().String()).
Str("raw", string(raw)).
Msg("received message from client")