diff options
| author | r5d <s@ricketyspace.net> | 2017-07-26 23:16:20 +0300 |
|---|---|---|
| committer | ohemorange <ebportnoy@gmail.com> | 2017-07-26 23:16:20 +0300 |
| commit | 142ced234b7561c24f2fd089090cf16b64566ae8 (patch) | |
| tree | 60a98fc3b1b0749456e98f8f368d407f69cd6968 | |
| parent | 5845f186ed98e925a50aa2f119297d4c272dd406 (diff) | |
Add cert name in renewal error messages (#4932) (#4957)
* Add cert name in renewal error messages (#4932)
* certbot: Fix error message in `handle_renewal_request`.
| -rw-r--r-- | certbot/renewal.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/certbot/renewal.py b/certbot/renewal.py index 5c6697941..f3131c06f 100644 --- a/certbot/renewal.py +++ b/certbot/renewal.py @@ -389,14 +389,16 @@ def handle_renewal_request(config): disp = zope.component.getUtility(interfaces.IDisplay) disp.notification("Processing " + renewal_file, pause=False) lineage_config = copy.deepcopy(config) + lineagename = storage.lineagename_for_filename(renewal_file) # Note that this modifies config (to add back the configuration # elements from within the renewal configuration file). try: renewal_candidate = _reconstitute(lineage_config, renewal_file) except Exception as e: # pylint: disable=broad-except - logger.warning("Renewal configuration file %s produced an " - "unexpected error: %s. Skipping.", renewal_file, e) + logger.warning("Renewal configuration file %s (cert: %s) " + "produced an unexpected error: %s. Skipping.", + renewal_file, lineagename, e) logger.debug("Traceback was:\n%s", traceback.format_exc()) parse_failures.append(renewal_file) continue @@ -422,8 +424,9 @@ def handle_renewal_request(config): renew_skipped.append(renewal_candidate.fullchain) except Exception as e: # pylint: disable=broad-except # obtain_cert (presumably) encountered an unanticipated problem. - logger.warning("Attempting to renew cert from %s produced an " - "unexpected error: %s. Skipping.", renewal_file, e) + logger.warning("Attempting to renew cert (%s) from %s produced an " + "unexpected error: %s. Skipping.", lineagename, + renewal_file, e) logger.debug("Traceback was:\n%s", traceback.format_exc()) renew_failures.append(renewal_candidate.fullchain) |