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

Allow custom log function. Not only console

This commit is contained in:
GermanBluefox 2016-08-25 22:09:23 +02:00 committed by GitHub
parent 7c62f1fd3e
commit 88f5bcc58c
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
index.js
View File

@ -9,6 +9,15 @@ LE.LE = LE;
// in-process cache, shared between all instances // in-process cache, shared between all instances
var ipc = {}; var ipc = {};
function _log(debug) {
if (debug) {
var args = Array.prototype.slice.call(arguments);
args.shift();
args.unshift("[le/index.js]");
console.log.apply(console, args);
}
}
LE.defaults = { LE.defaults = {
productionServerUrl: ACME.productionServerUrl productionServerUrl: ACME.productionServerUrl
, stagingServerUrl: ACME.stagingServerUrl , stagingServerUrl: ACME.stagingServerUrl
@ -64,6 +73,7 @@ LE.create = function (le) {
le.acme = le.acme || ACME.create({ debug: le.debug }); le.acme = le.acme || ACME.create({ debug: le.debug });
le.store = le.store || require('le-store-certbot').create({ debug: le.debug }); le.store = le.store || require('le-store-certbot').create({ debug: le.debug });
le.core = require('./lib/core'); le.core = require('./lib/core');
var log = le.log || _log;
if (!le.challenges) { if (!le.challenges) {
le.challenges = {}; le.challenges = {};
@ -187,25 +197,19 @@ LE.create = function (le) {
lexOpts.agreeTos = le.agreeTos; lexOpts.agreeTos = le.agreeTos;
return cb(null, { options: lexOpts, certs: certs }); return cb(null, { options: lexOpts, certs: certs });
} }
if (le.debug) { log(le.debug, 'unapproved domain', lexOpts.domains, le.approvedDomains);
console.log('unapproved domain', lexOpts.domains, le.approvedDomains);
}
cb(new Error("unapproved domain")); cb(new Error("unapproved domain"));
}; };
} }
le.getCertificates = function (domain, certs, cb) { le.getCertificates = function (domain, certs, cb) {
// certs come from current in-memory cache, not lookup // certs come from current in-memory cache, not lookup
if (le.debug) { log(le.debug, 'le.getCertificates called for', domain, 'with certs for', certs && certs.altnames || 'NONE');
console.log('le.getCertificates called for', domain, 'with certs for', certs && certs.altnames || 'NONE');
}
var opts = { domain: domain, domains: certs && certs.altnames || [ domain ] }; var opts = { domain: domain, domains: certs && certs.altnames || [ domain ] };
le.approveDomains(opts, certs, function (_err, results) { le.approveDomains(opts, certs, function (_err, results) {
if (le.debug) { log(le.debug, 'le.approveDomains called with certs for', results.certs && results.certs.altnames || 'NONE', 'and options:');
console.log('le.approveDomains called with certs for', results.certs && results.certs.altnames || 'NONE', 'and options:'); log(le.debug, results.options);
console.log(results.options);
}
if (_err) { if (_err) {
cb(_err); cb(_err);
return; return;
@ -214,15 +218,11 @@ LE.create = function (le) {
var promise; var promise;
if (results.certs) { if (results.certs) {
if (le.debug) { log(le.debug, 'le renewing');
console.log('le renewing');
}
promise = le.core.certificates.renewAsync(results.options, results.certs); promise = le.core.certificates.renewAsync(results.options, results.certs);
} }
else { else {
if (le.debug) { log(le.debug, 'le getting from disk or registering new');
console.log('le getting from disk or registering new');
}
promise = le.core.certificates.getAsync(results.options); promise = le.core.certificates.getAsync(results.options);
} }