From b5ddc105852b63651916f322ce855baf61d129d0 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Wed, 18 Nov 2020 08:47:37 +0200 Subject: feat! change client config to take a base URL instead of host, port --- src/cmd/backup.rs | 2 +- src/cmd/list.rs | 2 +- src/cmd/restore.rs | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/cmd') diff --git a/src/cmd/backup.rs b/src/cmd/backup.rs index 308eafb..71f5aac 100644 --- a/src/cmd/backup.rs +++ b/src/cmd/backup.rs @@ -5,7 +5,7 @@ use std::path::Path; pub fn backup(config: &Path, buffer_size: usize) -> anyhow::Result<()> { let config = ClientConfig::read_config(config)?; - let client = BackupClient::new(&config.server_name, config.server_port)?; + let client = BackupClient::new(&config.server_url)?; { let mut gen = Generation::create(&config.dbname)?; diff --git a/src/cmd/list.rs b/src/cmd/list.rs index 1972144..1741bce 100644 --- a/src/cmd/list.rs +++ b/src/cmd/list.rs @@ -3,7 +3,7 @@ use std::path::Path; pub fn list(config: &Path) -> anyhow::Result<()> { let config = ClientConfig::read_config(&config)?; - let client = BackupClient::new(&config.server_name, config.server_port)?; + let client = BackupClient::new(&config.server_url)?; for gen_id in client.list_generations()? { println!("{}", gen_id); diff --git a/src/cmd/restore.rs b/src/cmd/restore.rs index 6e2690c..8aa0345 100644 --- a/src/cmd/restore.rs +++ b/src/cmd/restore.rs @@ -12,7 +12,7 @@ use structopt::StructOpt; pub fn restore(config: &Path, gen_id: &str, dbname: &Path, to: &Path) -> anyhow::Result<()> { let config = Config::read_config(&config).unwrap(); - let client = BackupClient::new(&config.server_name, config.server_port)?; + let client = BackupClient::new(&config.server_url)?; let gen_chunk = client.fetch_generation(&gen_id)?; debug!("gen: {:?}", gen_chunk); { @@ -50,8 +50,7 @@ struct Opt { #[derive(Debug, Deserialize, Clone)] pub struct Config { - pub server_name: String, - pub server_port: u16, + pub server_url: String, } impl Config { -- cgit v1.2.1