Merge pull request #21 from kpcyrd/update

Reduce timeouts for check http requests
kpcyrd · May 6, 2021 · 8b14294 · 8b14294
2 parents 2bb7cab + 2838e7e
commit 8b14294
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 45 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/args.rs b/src/args.rs
@@ -100,6 +100,9 @@ pub struct RenewArgs {
     /// Don't clean up old certs that are not live anymore
     #[structopt(long)]
     pub skip_cleanup: bool,
+    /// Only execute hooks without actually renewing certs
+    #[structopt(long)]
+    pub hooks_only: bool,
     /// Only renew specific certs
     pub certs: Vec<String>,
 }

diff --git a/src/check.rs b/src/check.rs
@@ -7,9 +7,9 @@ use std::collections::HashSet;
 pub fn check(name: &str, token: &str) -> Result<()> {
     let url = format!("http://{}/.well-known/acme-challenge/{}", name, token);
     let r = ureq::get(&url)
-        .timeout_connect(30_000)
-        .timeout_read(30_000)
-        .timeout_write(30_000)
+        .timeout_connect(3_000)
+        .timeout_read(3_000)
+        .timeout_write(3_000)
         .call();
 
     let status = r.status();

diff --git a/src/renew.rs b/src/renew.rs
@@ -67,7 +67,7 @@ fn renew_cert(
         return Ok(());
     }
 
-    if args.dry_run {
+    if args.dry_run || args.hooks_only {
         info!("renewing {:?} (dry run)", cert.name);
     } else {
         info!("renewing {:?}", cert.name);