fix: print rcmgr to logger
Jorropo committed
Jun 8, 2023 at 11:57 UTC
b55cd72657e5edc44f58c54db8d58b7cd43221e2
2 files changed
+6
-12
core/node/libp2p/rcmgr.go
+6
-5
@@ -23,6 +23,8 @@ import (
23
"github.com/ipfs/kubo/repo"
24
)
25
26
+var rcmgrLogger = logging.Logger("rcmgr")
27
+
28
const NetLimitTraceFilename = "rcmgr.json.gz"
29
30
var ErrNoResourceMgr = fmt.Errorf("missing ResourceMgr: make sure the daemon is running with Swarm.ResourceMgr.Enabled")
@@ -56,14 +58,13 @@ func ResourceManager(cfg config.SwarmConfig, userResourceOverrides rcmgr.Partial
58
}
59
60
if !isPartialConfigEmpty(userResourceOverrides) {
59
- fmt.Print(`
61
+ rcmgrLogger.Info(`
62
libp2p-resource-limit-overrides.json has been loaded, "default" fields will be
61
-filled in with autocomputed defaults.
62
-`)
63
+filled in with autocomputed defaults.`)
64
}
65
66
// We want to see this message on startup, that's why we are using fmt instead of log.
66
- fmt.Print(msg)
67
+ rcmgrLogger.Info(msg)
68
69
if err := ensureConnMgrMakeSenseVsResourceMgr(limitConfig, cfg); err != nil {
70
return nil, opts, err
@@ -109,7 +110,7 @@ filled in with autocomputed defaults.
110
lrm.start(helpers.LifecycleCtx(mctx, lc))
111
manager = lrm
112
} else {
112
- fmt.Println("go-libp2p resource manager protection disabled")
113
+ rcmgrLogger.Info("go-libp2p resource manager protection disabled")
114
manager = &network.NullResourceManager{}
115
}
116
test/sharness/t0060-daemon.sh
-7
@@ -80,13 +80,6 @@ test_expect_success "ipfs daemon output looks good" '
80
STARTFILE="ipfs cat /ipfs/$HASH_WELCOME_DOCS/readme" &&
81
echo "Initializing daemon..." >expected_daemon &&
82
ipfs version --all >> expected_daemon &&
83
- echo "" >>expected_daemon &&
84
- echo "Computed default go-libp2p Resource Manager limits based on:" >>expected_daemon &&
85
- echo " - '"'"'Swarm.ResourceMgr.MaxMemory'"'"': \"4GB\"" >>expected_daemon &&
86
- echo " - '"'"'Swarm.ResourceMgr.MaxFileDescriptors'"'"': 1024" >>expected_daemon &&
87
- echo "" >>expected_daemon &&
88
- echo "Theses can be inspected with '"'"'ipfs swarm resources'"'"'." >>expected_daemon &&
89
- echo "" >>expected_daemon &&
83
sed "s/^/Swarm listening on /" listen_addrs >>expected_daemon &&
84
sed "s/^/Swarm announcing /" local_addrs >>expected_daemon &&
85
echo "RPC API server listening on '$API_MADDR'" >>expected_daemon &&