Skip to content

Make compute provider endpoint configurable. #325

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

Merged
enzoh merged 4 commits into from
Jan 17, 2020
Merged

Make compute provider endpoint configurable. #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9bffe64
Make compute provider endpoint configurable
enzoh Jan 17, 2020
b8aca73
Format
enzoh Jan 17, 2020
25d3468
Merge branch 'master' into enzoh/bootstrap
enzoh Jan 17, 2020
6275bb4
Resolve Efty comments
enzoh Jan 17, 2020
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
12 changes: 11 additions & 1 deletion src/dfx/src/commands/start.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,22 @@ pub fn exec(env: &dyn Environment, args: &ArgMatches<'_>) -> DfxResult {
)
})?;

let provider: String = match config
.get_config()
.get_defaults()
.get_start()
.provider
.clone()
{
Some(provider) => provider,
None => IC_CLIENT_BIND_ADDR.to_owned(),
};
let bootstrap_dir = env
.get_cache()
.get_binary_command_path("js-user-library/dist/bootstrap")?;
let frontend_watchdog = webserver(
address_and_port,
url::Url::parse(IC_CLIENT_BIND_ADDR).unwrap(),
url::Url::parse(&provider).unwrap(),
&bootstrap_dir,
give_actix,
);
Expand Down
2 changes: 2 additions & 0 deletions src/dfx/src/config/dfinity.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const EMPTY_CONFIG_DEFAULTS_START: ConfigDefaultsStart = ConfigDefaultsStart {
port: None,
nodes: None,
serve_root: None,
provider: None,
};
const EMPTY_CONFIG_DEFAULTS_BUILD: ConfigDefaultsBuild = ConfigDefaultsBuild { output: None };

Expand All @@ -33,6 +34,7 @@ pub struct ConfigDefaultsStart {
pub nodes: Option<u64>,
pub port: Option<u16>,
pub serve_root: Option<String>,
pub provider: Option<String>,
}

#[derive(Clone, Debug, Serialize, Deserialize)]
Expand Down