hatter/acme-client-rs
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: add port for cert config

Browse Source
This commit is contained in:
Hatter Jiang
2021-09-04 01:06:09 +08:00
parent ee17791b57
commit 60a732ef0c
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.rs
View File

@@ -186,6 +186,14 @@ async fn main() -> tide::Result<()> {
}
};
let cert_config_file = matches.value_of("config");
let cert_config = cert_config_file.map(|f|
CertConfig::load(f).unwrap_or_else(|e| {
failure!("Load cert config: {}, failed: {}", f, e);
exit(1);
}));
let port = cert_config.as_ref().map(|c| c.port).flatten().unwrap_or(port);
let check = matches.is_present("check");
if !check {
@@ -195,7 +203,6 @@ async fn main() -> tide::Result<()> {
task::sleep(Duration::from_millis(500)).await;
}
let cert_config = matches.value_of("config");
match cert_config {
None => { // cert config is not assigned
if check {
@@ -240,12 +247,6 @@ async fn main() -> tide::Result<()> {
}
}
Some(cert_config) => { // cert config is assigned
let cert_config = {
CertConfig::load(cert_config).unwrap_or_else(|e| {
failure!("Load cert config: {}, failed: {}", cert_config, e);
exit(1);
})
};
if check {
check_cert_config(&cert_config);
return Ok(());