fixup! Log successfully issued certificates.

Author: bavshin-f5

src/lib.rs

@@ -280,6 +280,8 @@ async fn ngx_http_acme_update_certificates_for_issuer(
             continue;
         };
 
+        let order_id = order.cache_key();
+
         {
             let locked = cert.read();
 
@@ -290,9 +292,8 @@ async fn ngx_http_acme_update_certificates_for_issuer(
             if !locked.is_renewable() {
                 ngx_log_debug!(
                     log.as_ptr(),
-                    "acme: certificate \"{}/{}\" is not due for renewal",
-                    issuer.name,
-                    order.cache_key()
+                    "acme: certificate \"{issuer}/{order_id}\" is not due for renewal",
+                    issuer = issuer.name,
                 );
                 next = cmp::min(locked.next, next);
                 continue;
@@ -324,9 +325,9 @@ async fn ngx_http_acme_update_certificates_for_issuer(
                         ngx_log_error!(
                             NGX_LOG_INFO,
                             log.as_ptr(),
-                            "acme certificate \"{}/{}\" issued, next renewal in {:?}",
+                            "acme certificate \"{}/{}\" issued, next update in {:?}",
                             issuer.name,
-                            order.cache_key(),
+                            order_id,
                             (x - now)
                         );
                         x
@@ -335,23 +336,19 @@ async fn ngx_http_acme_update_certificates_for_issuer(
                         ngx_log_error!(
                             NGX_LOG_WARN,
                             log.as_ptr(),
-                            "acme certificate \"{}/{}\" request failed: {}",
-                            issuer.name,
-                            order.cache_key(),
-                            err
+                            "{err} while updating certificate \"{issuer}/{order_id}\"",
+                            issuer = issuer.name,
                         );
                         now + ACME_MIN_INTERVAL
                     }
                 };
 
                 // Write files even if we failed to update the shared zone.
 
-                let _ =
-                    issuer.write_state_file(std::format!("{}.crt", order.cache_key()), &val.chain);
+                let _ = issuer.write_state_file(std::format!("{order_id}.crt"), &val.chain);
 
                 if !matches!(order.key, conf::pkey::PrivateKey::File(_)) {
-                    let _ =
-                        issuer.write_state_file(std::format!("{}.key", order.cache_key()), &pkey);
+                    let _ = issuer.write_state_file(std::format!("{order_id}.key"), &pkey);
                 }
 
                 next
@@ -360,25 +357,22 @@ async fn ngx_http_acme_update_certificates_for_issuer(
                 ngx_log_error!(
                     NGX_LOG_ERR,
                     log.as_ptr(),
-                    "acme certificate \"{}/{}\" request is not valid: {}",
-                    issuer.name,
-                    order.cache_key(),
-                    err
+                    "{err} while updating certificate \"{issuer}/{order_id}\"",
+                    issuer = issuer.name,
                 );
                 cert.write().set_invalid(&err);
 
                 // We marked the order as invalid and will stop attempting to update it until the
                 // next configuration reload. It should not affect the next update schedule.
+
                 continue;
             }
             Err(ref err) => {
                 ngx_log_error!(
                     NGX_LOG_WARN,
                     log.as_ptr(),
-                    "acme certificate \"{}/{}\" request failed: {}",
-                    issuer.name,
-                    order.cache_key(),
-                    err
+                    "{err} while updating certificate \"{issuer}/{order_id}\"",
+                    issuer = issuer.name,
                 );
                 cert.write().set_error(&err)
             }