Skip to content
This repository has been archived by the owner on Oct 23, 2022. It is now read-only.

http: configuration refactor #423

Merged
merged 6 commits into from
Oct 30, 2020
Merged

http: configuration refactor #423

merged 6 commits into from
Oct 30, 2020

Conversation

niklaslong
Copy link
Member

@niklaslong niklaslong commented Oct 29, 2020 •
edited
Loading

This is a wip but opening as a draft to keep track of this follow up to #421. This is also part of #402.

This introduces the Config struct to serve as a facade to the configuration module. It's essentially a flattened CompatibleConfigFile struct exposing only the fields necessary to running the daemon.

koivunej
koivunej reviewed Oct 30, 2020
View reviewed changes
Copy link
Collaborator

@koivunej koivunej left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good. Found some older bugs we should at least be aware of. One question.

http/src/config.rs Show resolved Hide resolved
http/src/config.rs Outdated Show resolved Hide resolved
http/src/main.rs Show resolved Hide resolved
http/src/main.rs Show resolved Hide resolved
koivunej
koivunej reviewed Oct 30, 2020
View reviewed changes
http/src/config.rs Outdated Show resolved Hide resolved
koivunej
koivunej approved these changes Oct 30, 2020
View reviewed changes
Copy link
Collaborator

@koivunej koivunej left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The unwrap remains which I think we should get rid of, by using the std::io::Error wrapping variant or widening the wrapped type in the more fitting from serde_json::Error to Box<dyn std::error::Error + 'static>.

Good to go after that.

bors d+

@bors
Copy link
Contributor

bors bot commented Oct 30, 2020

✌️ niklaslong can now approve this pull request. To approve and merge a pull request, simply reply with bors r+. More detailed instructions are available here.

@niklaslong niklaslong marked this pull request as ready for review October 30, 2020 17:04
@niklaslong
Copy link
Member Author

bors r+

@bors
Copy link
Contributor

bors bot commented Oct 30, 2020

Build succeeded:

@bors bors bot merged commit 73409a8 into rs-ipfs:master Oct 30, 2020
@niklaslong niklaslong deleted the 402-config-refactor branch October 30, 2020 17:47
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Reviewers

@koivunej koivunej koivunej approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@niklaslong @koivunej