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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: only over-write http_port when cli arg is passed #489

Merged
merged 2 commits into from
Aug 7, 2023
Merged

Fix: only over-write http_port when cli arg is passed #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5126f5
Only over-ride http_port when cli arg is passed
sandreae Aug 7, 2023
95034ff
Update CHANGELOG
sandreae Aug 7, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Do nothing on log insertion conflict [#468](https://github.com/p2panda/aquadoggo/pull/468)
- Don't update or announce an update in schema provider if a schema with this id exists already [#472](https://github.com/p2panda/aquadoggo/pull/472)
- Do nothing on document_view insertion conflicts [#474](https://github.com/p2panda/aquadoggo/pull/474)
- Only over-write `http_port` when cli arg is passed [#489](https://github.com/p2panda/aquadoggo/pull/489)

### Open Sauce

Expand Down
4 changes: 3 additions & 1 deletion aquadoggo_cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,9 @@ impl TryFrom<Cli> for Configuration {
None
};

config.http_port = cli.http_port.unwrap_or(2020);
if let Some(http_port) = cli.http_port {
config.http_port = http_port
}

config.network = NetworkConfiguration {
autonat: cli.autonat.unwrap_or(false),
Expand Down
Loading