Skip to content

Commit 4824553

Browse files
committed
fix: logger
1 parent 856aec2 commit 4824553

3 files changed

Lines changed: 8 additions & 14 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/cloudlink-delta/duplex
33
go 1.26.2
44

55
require (
6-
github.com/cloudlink-delta/peerjs-go v0.0.0-20260417190947-ccacadd5d31e
6+
github.com/cloudlink-delta/peerjs-go v0.0.0-20260417204616-3d3dc508461a
77
github.com/goccy/go-json v0.10.6
88
github.com/pion/webrtc/v3 v3.3.6
99
github.com/rs/zerolog v1.35.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github.com/chuckpreslar/emission v0.0.0-20170206194824-a7ddd980baf9 h1:xz6Nv3zcwO2Lila35hcb0QloCQsc38Al13RNEzWRpX4=
22
github.com/chuckpreslar/emission v0.0.0-20170206194824-a7ddd980baf9/go.mod h1:2wSM9zJkl1UQEFZgSd68NfCgRz1VL1jzy/RjCg+ULrs=
3-
github.com/cloudlink-delta/peerjs-go v0.0.0-20260417190947-ccacadd5d31e h1:U10RmICpFc63IU+66RcpFV6YFhH2+feZOx2cJ+kLlNM=
4-
github.com/cloudlink-delta/peerjs-go v0.0.0-20260417190947-ccacadd5d31e/go.mod h1:oTHvo7qdEF9VuRlCyWyGdScHekIAmq4PLPBTnsv0aKY=
3+
github.com/cloudlink-delta/peerjs-go v0.0.0-20260417204616-3d3dc508461a h1:RJSfKCmZ0lTQhKLbdMtuMgCt+dBiDdCIVmZA4Y4Nd6c=
4+
github.com/cloudlink-delta/peerjs-go v0.0.0-20260417204616-3d3dc508461a/go.mod h1:zV9o/pJVO6yor7qZ7Lbs8fmL9rDRp6IVYvDs2f0RIrQ=
55
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
66
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
77
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

instance.go

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ type Config struct {
1919
ICEServers []webrtc.ICEServer
2020
EnablePinger bool
2121
PingInterval int64 // in milliseconds
22-
Logger *zerolog.Logger
22+
LogLevel zerolog.Level
2323
}
2424

2525
type Peers map[string]*Peer
@@ -44,11 +44,10 @@ func New(ID string, args *Config) *Instance {
4444
return i
4545
}
4646

47-
func (i *Instance) default_logger() *zerolog.Logger {
47+
func (i *Instance) default_logger(level zerolog.Level) *zerolog.Logger {
4848
// Configure zerolog
4949
output := zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: time.RFC3339}
50-
logger := zerolog.New(output).With().Timestamp().Logger()
51-
zerolog.SetGlobalLevel(zerolog.InfoLevel)
50+
logger := zerolog.New(output).With().Timestamp().Logger().Level(level)
5251
logger = logger.With().Str("instance", i.Name).Logger()
5352
return &logger
5453
}
@@ -65,13 +64,8 @@ func (i *Instance) configure(args *Config) {
6564
i.PingInterval = time.Duration(args.PingInterval) * time.Millisecond
6665
}
6766

68-
if args.Logger == nil {
69-
i.Logger = i.default_logger()
70-
} else {
71-
i.Logger = args.Logger
72-
}
73-
74-
config.LogLevel = i.Logger.GetLevel()
67+
i.Logger = i.default_logger(args.LogLevel)
68+
config.LogLevel = args.LogLevel
7569

7670
if len(args.Hostname) > 0 {
7771
config.Host = args.Hostname

0 commit comments

Comments
 (0)