This repository has been archived by the owner on Feb 12, 2024. It is now read-only.
Loosen up init requirements: accept already initialised repos #808
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Currently failing with: |
src/core/boot.js
Outdated
| tasks.push((cb) => self.init(initOptions, cb)) | ||
| tasks.push((cb) => { | ||
| console.log('Doing init') | ||
| self._repo.exists((err, exists) => { |
There was a problem hiding this comment.
this doesn't make much sense as it's the same thing as in the else branch
src/core/boot.js
Outdated
| if (err) cb(err) | ||
| console.log('exists', err, exists) | ||
| if (exists) { | ||
| cb(null, true) |
There was a problem hiding this comment.
you need to call maybeOpenRepo if you don't do init
src/core/boot.js
Outdated
| @@ -49,7 +49,16 @@ module.exports = (self) => { | |||
|
|
|||
| if (doInit) { | |||
| self.log('boot:doInit') | |||
| tasks.push((cb) => self.init(initOptions, cb)) | |||
| tasks.push((cb) => { | |||
| self._repo.exists((err, exists) => { | |||
There was a problem hiding this comment.
you are still doing the same call twice in the if (doInit). you can just call repo.exists and do the if doInit check later down
There was a problem hiding this comment.
Something like this
self._repo.exists((err, hasRepo) => {
if (err) {
return done(err)
}
if (doInit && !hasRepo) {
tasks.push((cb) => self.init(initOptions, cb))
}
if (hasRepo) {
tasks.push(maybeOpenRepo)
}
if (setConfig) {
// ...
})
src/core/boot.js
Outdated
| tasks.push((cb) => self.init(initOptions, cb)) | ||
| tasks.push((cb) => { | ||
| self._repo.exists((err, exists) => { | ||
| if (err) cb(err) |
There was a problem hiding this comment.
needs to return and please on with braces on multiple lines
|
Ready to be checked and eventually merged now :) |
|
@victorbjelkholm did you see my comments? |
victorb
force-pushed
the
fix/init-twice
branch
3 times, most recently
from
43f8c3f to
4f763ef
Compare
src/core/boot.js
Outdated
| if (repoExists) { | ||
| tasks.push(maybeOpenRepo) | ||
| } | ||
| next(null, repoExists) |
There was a problem hiding this comment.
no need for the next function anymore :)
daviddias
force-pushed
the
fix/init-twice
branch
from
1e440f6 to
bf93bc5
Compare
dignifiedquire
suggested changes
Mar 23, 2017
src/core/boot.js
Outdated
| } | ||
| if (repoExists) { | ||
| tasks.push(maybeOpenRepo) | ||
| } |
There was a problem hiding this comment.
There is still a bug, next needs to be called with hasRepo not true
There was a problem hiding this comment.
@dignifiedquire I've tried that and then I get bunch of failures
WARNING, trying to set config on uninitialized repo, maybe forgot to set "init: true"
WARNING, trying to start ipfs node on uninitialized repo, maybe forgot to set "init: true"
src/core/boot.js
Outdated
| if (doInit && !repoExists) { | ||
| tasks.push((cb) => self.init(initOptions, cb)) | ||
| } | ||
| if (repoExists) { |
There was a problem hiding this comment.
This needs to check for !doInit as well
daviddias
changed the title
dignifiedquire
approved these changes
Mar 23, 2017
daviddias
reviewed
Mar 23, 2017
| series(tasks, done) | ||
| } | ||
| }) | ||
| } |
dignifiedquire
force-pushed
the
fix/init-twice
branch
from
f90dc4a to
26e6290
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR will make it so if you start a node twice with the same path, it won't crash when trying to initialize a new repo. Synonym with doing
ipfs daemon --initwith go-ipfs in terminal.