Skip to content

peer: route the peer-box sing-box logger into radiance's slog #481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
myleshorton wants to merge 1 commit into
base: fisk/peer-connection-events
Choose a base branch
from
Open

peer: route the peer-box sing-box logger into radiance's slog #481

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion peer/peer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@ import (
"time"

"github.com/sagernet/sing-box/experimental/libbox"
sblog "github.com/sagernet/sing-box/log"
"github.com/sagernet/sing/service"

box "github.com/getlantern/lantern-box"
lblog "github.com/getlantern/lantern-box/log"
"github.com/getlantern/lantern-box/tracker/peerconn"
"github.com/getlantern/radiance/common/settings"
"github.com/getlantern/radiance/events"
Expand Down Expand Up @@ -613,7 +616,17 @@ func pickInternalPort() uint16 {
// here are scoped to this peer's box instance so the two coexist
// without stomping on each other.
func defaultBuildBoxService(_ context.Context, options string) (boxService, error) {
bs, err := libbox.NewServiceWithContext(box.BaseContext(), options, nil)
// Wire the peer's sing-box logger into radiance's slog so router /
// dial / outbound errors from this second box instance reach the
// same lantern.log as everything else. Without this the box's
// default stderr-only logger silently swallows the most useful
// signal — e.g. "why did api.iantem.io fail to dial?" during a
// peer-share verify failure — which made FD #174614 unnecessarily
// hard to triage. Mirrors vpn/tunnel.go's registration for the
// main tunnel's box.
Comment on lines +624 to +626
ctx := box.BaseContext()
service.MustRegister[sblog.Factory](ctx, lblog.NewFactory(slog.Default().Handler()))
bs, err := libbox.NewServiceWithContext(ctx, options, nil)
if err != nil {
return nil, fmt.Errorf("libbox.NewServiceWithContext: %w", err)
}
Expand Down
Loading