1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

util, debugger: remove internalUtil.error

Browse Source 
The internalUtil.error() function was only used by _debugger.js.

PR-URL: https://github.com/nodejs/node/pull/11448
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
This commit is contained in:
James M Snell 2017-02-17 15:25:28 -08:00
parent b855dadae0
commit bc44d2c3cd
3 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/_debugger.js
View File

@ -1,6 +1,5 @@
'use strict'; 'use strict';
const internalUtil = require('internal/util');
const util = require('util'); const util = require('util');
const path = require('path'); const path = require('path');
const net = require('net'); const net = require('net');
@ -11,6 +10,11 @@ const inherits = util.inherits;
const assert = require('assert'); const assert = require('assert');
const spawn = require('child_process').spawn; const spawn = require('child_process').spawn;
const Buffer = require('buffer').Buffer; const Buffer = require('buffer').Buffer;
const prefix = `(${process.release.name}:${process.pid}) `;
function error(msg) {
console.error(`${prefix}${msg}`);
}
exports.start = function(argv, stdin, stdout) { exports.start = function(argv, stdin, stdout) {
argv || (argv = process.argv.slice(2)); argv || (argv = process.argv.slice(2));
@ -32,8 +36,8 @@ exports.start = function(argv, stdin, stdout) {
stdin.resume(); stdin.resume();
process.on('uncaughtException', function(e) { process.on('uncaughtException', function(e) {
internalUtil.error('There was an internal error in Node\'s debugger. ' + error('There was an internal error in Node\'s debugger. ' +
'Please report this bug.'); 'Please report this bug.');
console.error(e.message); console.error(e.message);
console.error(e.stack); console.error(e.stack);
if (interface_.child) interface_.child.kill(); if (interface_.child) interface_.child.kill();
@ -521,7 +525,7 @@ Client.prototype.mirrorObject = function(handle, depth, cb) {
cb = cb || function() {}; cb = cb || function() {};
this.reqLookup(propertyRefs, function(err, res) { this.reqLookup(propertyRefs, function(err, res) {
if (err) { if (err) {
internalUtil.error('problem with reqLookup'); error('problem with reqLookup');
cb(null, handle); cb(null, handle);
return; return;
} }
@ -1672,7 +1676,7 @@ Interface.prototype.trySpawn = function(cb) {
process._debugProcess(pid); process._debugProcess(pid);
} catch (e) { } catch (e) {
if (e.code === 'ESRCH') { if (e.code === 'ESRCH') {
internalUtil.error(`Target process: ${pid} doesn't exist.`); error(`Target process: ${pid} doesn't exist.`);
process.exit(1); process.exit(1);
} }
throw e; throw e;
@ -1741,7 +1745,7 @@ Interface.prototype.trySpawn = function(cb) {
function connectError() { function connectError() {
// If it's failed to connect 10 times then print failed message // If it's failed to connect 10 times then print failed message
if (connectionAttempts >= 10) { if (connectionAttempts >= 10) {
internalUtil.error(' failed to connect, please retry'); error(' failed to connect, please retry');
process.exit(1); process.exit(1);
} }
setTimeout(attemptConnect, 500); setTimeout(attemptConnect, 500);

13
lib/internal/util.js
View File

@ -16,19 +16,6 @@ exports.deprecate = function(fn, msg, code) {
return exports._deprecate(fn, msg, code); return exports._deprecate(fn, msg, code);
}; };
exports.error = function(msg) {
const fmt = `${prefix}${msg}`;
if (arguments.length > 1) {
const args = new Array(arguments.length);
args[0] = fmt;
for (var i = 1; i < arguments.length; ++i)
args[i] = arguments[i];
console.error.apply(console, args);
} else {
console.error(fmt);
}
};
exports.trace = function(msg) { exports.trace = function(msg) {
console.trace(`${prefix}${msg}`); console.trace(`${prefix}${msg}`);
}; };

10
test/parallel/test-util-internal.js
View File

@ -4,7 +4,6 @@
const common = require('../common'); const common = require('../common');
const path = require('path'); const path = require('path');
const assert = require('assert'); const assert = require('assert');
const spawnSync = require('child_process').spawnSync;
const binding = process.binding('util'); const binding = process.binding('util');
const kArrowMessagePrivateSymbolIndex = binding['arrow_message_private_symbol']; const kArrowMessagePrivateSymbolIndex = binding['arrow_message_private_symbol'];
@ -59,12 +58,3 @@ try {
} }
assert(/bad_syntax\.js:1/.test(arrowMessage)); assert(/bad_syntax\.js:1/.test(arrowMessage));
const args = [
'--expose-internals',
'-e',
"require('internal/util').error('foo %d', 5)"
];
const result = spawnSync(process.argv[0], args, { encoding: 'utf8' });
assert.strictEqual(result.stderr.indexOf('%'), -1);
assert(/foo 5/.test(result.stderr));