Skip to content

Commit

Permalink
Revert "net: remove usage of require('util')"
Browse files Browse the repository at this point in the history
This reverts commit e112fb4.
This commit broke parallel/test-net-access-byteswritten.

PR-URL: #26896
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Yongsheng Zhang <[email protected]>
Reviewed-By: Gus Caplan <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Refael Ackermann <[email protected]>
  • Loading branch information
Trott committed Mar 25, 2019
1 parent 85fda7e commit 3f41fcb
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions lib/net.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@

const EventEmitter = require('events');
const stream = require('stream');
const { inspect } = require('internal/util/inspect');
const { debuglog } = require('internal/util/debuglog');
const util = require('util');
const internalUtil = require('internal/util');
const {
isIP,
Expand Down Expand Up @@ -131,7 +130,7 @@ function getNewAsyncId(handle) {
}


const debug = debuglog('net');
const debug = util.debuglog('net');

function isPipeName(s) {
return typeof s === 'string' && toNumber(s) === false;
Expand Down Expand Up @@ -336,8 +335,7 @@ function Socket(options) {
this[kBytesRead] = 0;
this[kBytesWritten] = 0;
}
Object.setPrototypeOf(Socket.prototype, stream.Duplex.prototype);
Object.setPrototypeOf(Socket, stream.Duplex);
util.inherits(Socket, stream.Duplex);

// Refresh existing timeouts.
Socket.prototype._unrefTimer = function _unrefTimer() {
Expand Down Expand Up @@ -1414,7 +1412,7 @@ Server.prototype.listen = function(...args) {
'must have the property "port" or "path"');
}

throw new ERR_INVALID_OPT_VALUE('options', inspect(options));
throw new ERR_INVALID_OPT_VALUE('options', util.inspect(options));
};

function lookupAndListen(self, port, address, backlog, exclusive, flags) {
Expand Down

0 comments on commit 3f41fcb

Please sign in to comment.