Skip to content

Commit 26d0849

Browse files
committed
Change Nodejs versions to support v8
1 parent 8c2fa9d commit 26d0849

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ node_js:
77
- "0.12"
88
- "4"
99
- "6"
10-
- "7"
10+
- "8"
1111
before_install:
1212
- npm install -g grunt-cli
1313
before_script:

lib/pem.js

+18-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
'use strict';
22

3+
var log4js = require('log4js');
4+
var logger = log4js.getLogger();
5+
log4js.configure({
6+
appenders: { console: { type: 'console' } },
7+
categories: { default: { appenders: [ 'console' ], level: 'info' } }
8+
});
9+
console.log = logger.info.bind(logger);
10+
logger.level = 'TRACE';
11+
312
var spawn = require('child_process').spawn;
413
var pathlib = require('path');
514
var fs = require('fs');
@@ -813,9 +822,8 @@ function verifySigningChain(certificate, ca, callback) {
813822
'--TMPFILE--'
814823
];
815824

816-
spawnWrapper(params, files, function(err, code, stdout, stderr) {
825+
spawnWrapper(params, files, function(err, code, stdout) {
817826
if (err) {
818-
console.log(err, stdout, stderr);
819827
return callback(err);
820828
}
821829

@@ -1064,7 +1072,7 @@ function spawnOpenSSL(params, binary, callback) {
10641072
if (--needed < 1) {
10651073
finished = true;
10661074
if (code) {
1067-
if (code === 2 && openSslVersion === "LIBRESSL") {
1075+
if (code === 2 && stderr === "") {
10681076
return callback(null, code, stdout, stderr);
10691077
}
10701078
return callback(new Error('Invalid openssl exit code: ' + code + '\n% openssl ' + params.join(' ') + '\n' + stderr), code);
@@ -1199,4 +1207,11 @@ spawnOpenSSL(['version'], false, function(err, code, stdout, stderr) {
11991207
openSslVersion = tmp && tmp[0] ? "LibreSSL" : "openssl";
12001208

12011209
openSslVersion = openSslVersion.toUpperCase();
1210+
1211+
logger.debug(openSslVersion);
1212+
logger.debug(text);
1213+
logger.debug(openSslVersion);
1214+
logger.debug(text);
1215+
logger.debug(openSslVersion);
1216+
logger.debug(text);
12021217
});

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
"dependencies": {
2323
"md5": "^2.2.1",
2424
"os-tmpdir": "^1.0.1",
25-
"which": "^1.2.4"
25+
"which": "^1.2.4",
26+
"log4js": "*"
2627
},
2728
"devDependencies": {
2829
"grunt": "^1.0.1",

0 commit comments

Comments
 (0)