jay/go-honeybee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update logging

Browse Source
This commit is contained in:
Jay
2026-05-21 08:19:37 -04:00
parent 90c0783953
commit f144a2a724
4 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pool.go
+5 -5
View File
@@ -203,7 +203,7 @@ func (p *Pool) SetDialer(d types.Dialer) {
func (p *Pool) Close() { func (p *Pool) Close() {
if p.logger != nil { if p.logger != nil {
p.logger.Debug("closing") p.logger.Info("closing")
} }
p.mu.Lock() p.mu.Lock()
@@ -233,7 +233,7 @@ func (p *Pool) Close() {
func (p *Pool) Connect(id string) error { func (p *Pool) Connect(id string) error {
if p.logger != nil { if p.logger != nil {
p.logger.Debug("connecting to peer", "peer", id) p.logger.Info("connecting", "peer", id)
} }
id, err := transport.NormalizeURL(id) id, err := transport.NormalizeURL(id)
@@ -273,7 +273,7 @@ func (p *Pool) Connect(id string) error {
p.peers[id] = &Peer{id: id, worker: worker} p.peers[id] = &Peer{id: id, worker: worker}
if p.logger != nil { if p.logger != nil {
p.logger.Info("registered peer", "peer", id) p.logger.Debug("registered peer", "peer", id)
} }
return nil return nil
@@ -281,7 +281,7 @@ func (p *Pool) Connect(id string) error {
func (p *Pool) Remove(id string) error { func (p *Pool) Remove(id string) error {
if p.logger != nil { if p.logger != nil {
p.logger.Debug("disconnecting from peer", "peer", id) p.logger.Info("disconnecting", "peer", id)
} }
id, err := transport.NormalizeURL(id) id, err := transport.NormalizeURL(id)
@@ -305,7 +305,7 @@ func (p *Pool) Remove(id string) error {
peer.worker.Stop() peer.worker.Stop()
if p.logger != nil { if p.logger != nil {
p.logger.Info("disconnected from peer", "peer", id) p.logger.Debug("disconnected from peer", "peer", id)
} }
return nil return nil
transport/connection.go
+6 -6
View File
@@ -219,7 +219,7 @@ func (c *Connection) Connect(ctx context.Context) error {
// socket acquisition failed // socket acquisition failed
c.state = StateDisconnected c.state = StateDisconnected
if c.logger != nil { if c.logger != nil {
c.logger.Error("connection failed", "error", err) c.logger.Warn("connection failed", "error", err)
} }
return NewConnectionError(err) return NewConnectionError(err)
} }
@@ -244,7 +244,7 @@ func (c *Connection) Connect(ctx context.Context) error {
c.state = StateConnected c.state = StateConnected
if c.logger != nil { if c.logger != nil {
c.logger.Info("connected") c.logger.Debug("connected")
} }
return nil return nil
@@ -357,7 +357,7 @@ func (c *Connection) classifyCloseError(err error) error {
switch closeErr.Code { switch closeErr.Code {
case websocket.CloseNormalClosure, websocket.CloseGoingAway: case websocket.CloseNormalClosure, websocket.CloseGoingAway:
if c.logger != nil { if c.logger != nil {
c.logger.Info("connection closed by peer", c.logger.Debug("connection closed by peer",
"code", closeErr.Code, "code", closeErr.Code,
"text", closeErr.Text, "text", closeErr.Text,
) )
@@ -366,7 +366,7 @@ func (c *Connection) classifyCloseError(err error) error {
default: default:
if c.logger != nil { if c.logger != nil {
c.logger.Error("unexpected close", c.logger.Warn("unexpected close",
"code", closeErr.Code, "code", closeErr.Code,
"text", closeErr.Text, "text", closeErr.Text,
) )
@@ -492,7 +492,7 @@ func (c *Connection) shutdownInner() {
}) })
if c.logger != nil { if c.logger != nil {
c.logger.Info("closing") c.logger.Debug("closing")
} }
if c.socket != nil { if c.socket != nil {
@@ -518,7 +518,7 @@ func (c *Connection) shutdownCleanup() {
close(c.errors) close(c.errors)
if c.logger != nil { if c.logger != nil {
c.logger.Info("closed") c.logger.Debug("closed")
} }
}) })
} }
transport/socket.go
+1 -1
View File
@@ -82,7 +82,7 @@ func AcquireSocket(
if !retryMgr.ShouldRetry() { if !retryMgr.ShouldRetry() {
// retry policy expired // retry policy expired
if logger != nil { if logger != nil {
logger.Error("dial failed, max retries reached", logger.Debug("dial failed, max retries reached",
"error", err, "error", err,
"attempt", retryMgr.RetryCount()+1) "attempt", retryMgr.RetryCount()+1)
} }
worker.go
+20 -16
View File
@@ -2,6 +2,7 @@ package honeybee
import ( import (
"context" "context"
"fmt"
"log/slog" "log/slog"
"sync" "sync"
"sync/atomic" "sync/atomic"
@@ -124,13 +125,13 @@ func (w *DefaultWorker) Start(pool PoolPlugin) {
}) })
if w.logger != nil { if w.logger != nil {
w.logger.Info("started") w.logger.Debug("started")
} }
wg.Wait() wg.Wait()
if w.logger != nil { if w.logger != nil {
w.logger.Info("stopped") w.logger.Debug("stopped")
} }
} }
@@ -162,7 +163,7 @@ func (w *DefaultWorker) runSession(ctx context.Context, pool PoolPlugin) {
case conn = <-newConn: case conn = <-newConn:
if w.logger != nil { if w.logger != nil {
w.logger.Debug("session: connected") w.logger.Info("connected")
} }
break preConn break preConn
@@ -171,7 +172,7 @@ func (w *DefaultWorker) runSession(ctx context.Context, pool PoolPlugin) {
case <-inactive(): case <-inactive():
if w.logger != nil { if w.logger != nil {
w.logger.Info("keepalive: no activity observed") w.logger.Warn("keepalive: no activity observed")
} }
timer.Reset(w.config.KeepaliveTimeout) timer.Reset(w.config.KeepaliveTimeout)
spawnDialer() spawnDialer()
@@ -183,7 +184,7 @@ func (w *DefaultWorker) runSession(ctx context.Context, pool PoolPlugin) {
pool.Events <- PoolEvent{ID: w.id, Kind: EventConnected, At: time.Now()} pool.Events <- PoolEvent{ID: w.id, Kind: EventConnected, At: time.Now()}
if w.logger != nil { if w.logger != nil {
w.logger.Info("session: started") w.logger.Debug("session: started")
} }
// run session loop // run session loop
@@ -195,8 +196,14 @@ func (w *DefaultWorker) runSession(ctx context.Context, pool PoolPlugin) {
case data, ok := <-conn.Incoming(): case data, ok := <-conn.Incoming():
if !ok { if !ok {
var reason error
select {
case reason = <-conn.Errors():
default:
reason = fmt.Errorf("unknown")
}
if w.logger != nil { if w.logger != nil {
w.logger.Debug("reader: disconnected") w.logger.Info("websocket: closed", "reason", reason)
} }
break conn_loop break conn_loop
} }
@@ -210,9 +217,6 @@ func (w *DefaultWorker) runSession(ctx context.Context, pool PoolPlugin) {
heartbeat() heartbeat()
case <-conn.Heartbeat(): case <-conn.Heartbeat():
if w.logger != nil {
w.logger.Debug("ping-pong heartbeat")
}
heartbeat() heartbeat()
case <-w.sendHeartbeat: case <-w.sendHeartbeat:
@@ -220,7 +224,7 @@ func (w *DefaultWorker) runSession(ctx context.Context, pool PoolPlugin) {
case <-inactive(): case <-inactive():
if w.logger != nil { if w.logger != nil {
w.logger.Info("keepalive: no activity observed") w.logger.Warn("keepalive: no activity observed")
} }
timer.Reset(w.config.KeepaliveTimeout) timer.Reset(w.config.KeepaliveTimeout)
break conn_loop break conn_loop
@@ -231,7 +235,10 @@ func (w *DefaultWorker) runSession(ctx context.Context, pool PoolPlugin) {
conn.Close() conn.Close()
if w.logger != nil { if w.logger != nil {
w.logger.Info("session: ended") w.logger.Info("disconnected")
}
if w.logger != nil {
w.logger.Debug("session: ended")
} }
// tear down connection // tear down connection
@@ -301,16 +308,13 @@ func (w *DefaultWorker) spawnDialer(
dialCtx, dialCancel := context.WithCancel(ctx) dialCtx, dialCancel := context.WithCancel(ctx)
if w.logger != nil { if w.logger != nil {
w.logger.Debug("session: requesting connection") w.logger.Debug("session: dialing")
} }
go func() { go func() {
conn, err := connect(w.id, dialCtx, pool, w.handler) conn, err := connect(w.id, dialCtx, pool, w.handler)
if err != nil { if err != nil {
if w.logger != nil {
w.logger.Warn("dialer: dial failed", "error", err)
}
return return
} }
@@ -345,7 +349,7 @@ func connect(
func (w *DefaultWorker) Stop() { func (w *DefaultWorker) Stop() {
if w.logger != nil { if w.logger != nil {
w.logger.Debug("shutting down") w.logger.Info("shutting down")
} }
w.cancel() w.cancel()
} }