Skip to content
This repository was archived by the owner on Sep 3, 2022. It is now read-only.

Replace 127.0.0.1's with localhost to support IPv6-only machines. #1190

Merged
merged 2 commits into from
Feb 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions sources/web/datalab/jupyter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function getNextJupyterPort(attempts: number, resolved: (port: number)=>void, fa
var port = nextJupyterPort;
nextJupyterPort++;

tcp.check(port, null).then(
tcp.check(port, "localhost").then(
function(inUse: boolean) {
if (inUse) {
getNextJupyterPort(attempts - 1, resolved, failed);
Expand Down Expand Up @@ -166,14 +166,14 @@ function createJupyterServerAtPort(port: number, userId: string, userDir: string

// Create the proxy.
var proxyOptions: httpProxy.ProxyServerOptions = {
target: 'http://127.0.0.1:' + port
target: 'http://localhost:' + port
};

server.proxy = httpProxy.createProxyServer(proxyOptions);
server.proxy.on('proxyRes', responseHandler);
server.proxy.on('error', errorHandler);

tcp.waitUntilUsed(server.port, 100, 15000).then(
tcp.waitUntilUsedOnHost(server.port, "localhost", 100, 15000).then(
function() {
jupyterServers[userId] = server;
logging.getLogger().info('Jupyter server started for %s.', userId);
Expand Down
2 changes: 1 addition & 1 deletion sources/web/datalab/reverseProxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export function handleRequest(request: http.ServerRequest,
}
else {
request.url = request.url.replace(regex, '/');
proxy.web(request, response, { target: 'http://127.0.0.1:' + port });
proxy.web(request, response, { target: 'http://localhost:' + port });
}
}

Expand Down
2 changes: 1 addition & 1 deletion sources/web/datalab/sockets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ var sessionCounter = 0;
* Creates a WebSocket connected to the Jupyter server for the URL in the specified session.
*/
function createWebSocket(port: number, session: Session): WebSocket {
var socketUrl = 'ws://127.0.0.1:' + port + url.parse(session.url).path;
var socketUrl = 'ws://localhost:' + port + url.parse(session.url).path;
logging.getLogger().debug('Creating WebSocket to %s for session %d', socketUrl, session.id);

var ws = new WebSocket(socketUrl);
Expand Down
2 changes: 2 additions & 0 deletions third_party/externs/ts/node/tcp-port-used.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@ declare module 'tcp-port-used' {
export function check(port: number, host: any): BooleanPromise;

export function waitUntilUsed(port: number, retryMs: number, timeOutMs: number): SimplePromise;

export function waitUntilUsedOnHost(port: number, host: string, retryTimeMs: number, timeOutMs: number): SimplePromise;
}