coolaj86
/
greenlock.js-ARCHIVED
3
3
Fork 0
Code Issues 6 Pull Requests 1 Releases Activity

better logging for approveDomains

This commit is contained in:
AJ ONeal 2018-05-17 21:35:03 +00:00
parent ec5d2d326b
commit da270686c0
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
index.js
View File

@ -343,7 +343,12 @@ Greenlock.create = function (gl) {
try { try {
gl.approveDomains(opts, certs, function (_err, results) { gl.approveDomains(opts, certs, function (_err, results) {
if (_err) { if (_err) {
log(gl.debug, 'gl.approveDomains called with error', _err); if (false !== gl.logRejectedDomains) {
console.error("logRejectedDomains: tls sni '" + domain + "' was rejected.");
console.error("See details at https://git.coolaj86.com/coolaj86/greenlock.js/issues/11.");
logRejectedDomains
console.error(_err);
}
cb(_err); cb(_err);
return; return;
} }
@ -351,21 +356,28 @@ Greenlock.create = function (gl) {
log(gl.debug, 'gl.approveDomains called with certs for', results.certs && results.certs.altnames || 'NONE', 'and options:'); log(gl.debug, 'gl.approveDomains called with certs for', results.certs && results.certs.altnames || 'NONE', 'and options:');
log(gl.debug, results.options); log(gl.debug, results.options);
var promise;
if (results.certs) { if (results.certs) {
log(gl.debug, 'gl renewing'); log(gl.debug, 'gl renewing');
promise = gl.core.certificates.renewAsync(results.options, results.certs); return gl.core.certificates.renewAsync(results.options, results.certs).then(
function (certs) { cb(null, certs); }
, function (e) {
console.debug("Error renewing certificate for '" + domain + "':");
console.debug(e);
cb(e);
}
);;
} }
else { else {
log(gl.debug, 'gl getting from disk or registering new'); log(gl.debug, 'gl getting from disk or registering new');
promise = gl.core.certificates.getAsync(results.options); return gl.core.certificates.getAsync(results.options).then(
} function (certs) { cb(null, certs); }
, function (e) {
return promise.then(function (certs) { cb(null, certs); }, function (e) { console.debug("Error loading/registering certificate for '" + domain + "':");
if (gl.debug) { console.debug("Error"); console.debug(e); } console.debug(e);
cb(e); cb(e);
}); }
);
}
}); });
} catch(e) { } catch(e) {
console.error("[ERROR] Something went wrong in approveDomains:"); console.error("[ERROR] Something went wrong in approveDomains:");