Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ipfs/kubo
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bb850b324cb6860ef3ba2961ddfb4ed54187a31e
Choose a base ref
..
head repository: ipfs/kubo
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9431bce9fe58b820e26fad5b1eb6d1ed1d648fdf
Choose a head ref
Showing with 4 additions and 4 deletions.
  1. +1 −1 config/types.go
  2. +3 −3 core/commands/swarm.go
2 changes: 1 addition & 1 deletion config/types.go
View file
Original file line number Diff line number Diff line change
@@ -432,7 +432,7 @@ func (swarmLimits) UnmarshalJSON(b []byte) error {
continue
}
//nolint
return fmt.Errorf("The Swarm.ResourceMgr.Limits configuration has been removed in Kubo 0.19 and should be empty or not present. To set custom libp2p limits, read https://github.com/libp2p/go-libp2p/tree/master/p2p/host/resource-manager#readme first, and then define them in $IPFS_PATH/libp2p-resource-limit-overrides.json")
return fmt.Errorf("The Swarm.ResourceMgr.Limits configuration has been removed in Kubo 0.19 and should be empty or not present. To set custom libp2p limits, read https://github.com/ipfs/kubo/blob/master/docs/libp2p-resource-management.md#user-supplied-override-limits")
default:
return err
}
6 changes: 3 additions & 3 deletions core/commands/swarm.go
View file
Original file line number Diff line number Diff line change
@@ -326,9 +326,9 @@ var swarmPeersCmd = &cmds.Command{
var swarmResourcesCmd = &cmds.Command{
Status: cmds.Experimental,
Helptext: cmds.HelpText{
Tagline: "Get a summary about all resources in use by libp2p Resource Manager.",
LongDescription: `Get a summary about all resources in use by libp2p Resource Manager.
This can output human readable table and JSON encoding.
Tagline: "Get a summary about all resources accounted for by the libp2p Resource Manager.",
LongDescription: `Get a summary about all resources accounted for by the libp2p Resource Manager. This includes the limits and the usage against those limits.
This can output a human readable table and JSON encoding.
`},
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
node, err := cmdenv.GetNode(env)