Skip to content
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

Jump to bottom

fix: ensure .Swarm.ConnMgr exists before accessing #2255

Merged
merged 2 commits into from
Sep 23, 2022
Merged

fix: ensure .Swarm.ConnMgr exists before accessing #2255

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
418b4f3
fix: make sure .Swarm.ConnMgr exists before changing
hacdias Sep 5, 2022
1fc8b2c
Merge branch 'main' into fix/2254
SgtPooki Sep 22, 2022
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
28 changes: 15 additions & 13 deletions src/daemon/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,19 +205,21 @@ function migrateConfig (ipfsd) {
}

if (CURRENT_REVISION < 4) {
// lower ConnMgr https://github.com/ipfs/ipfs-desktop/issues/2039
const { GracePeriod, LowWater, HighWater } = config.Swarm.ConnMgr
if (GracePeriod === '300s') {
config.Swarm.ConnMgr.GracePeriod = '1m'
changed = true
}
if (LowWater > 20) {
config.Swarm.ConnMgr.LowWater = 20
changed = true
}
if (HighWater > 40) {
config.Swarm.ConnMgr.HighWater = 40
changed = true
if (config.Swarm && config.Swarm.ConnMgr) {
// lower ConnMgr https://github.com/ipfs/ipfs-desktop/issues/2039
const { GracePeriod, LowWater, HighWater } = config.Swarm.ConnMgr
if (GracePeriod === '300s') {
config.Swarm.ConnMgr.GracePeriod = '1m'
changed = true
}
if (LowWater > 20) {
config.Swarm.ConnMgr.LowWater = 20
changed = true
}
if (HighWater > 40) {
config.Swarm.ConnMgr.HighWater = 40
changed = true
}
}
}

Expand Down