From c2bed83a8435cbf1f4c9a19b7120f687972b7739 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Tue, 26 Jul 2016 20:19:03 -0700 Subject: [PATCH] run-dev: Hardcode 127.0.0.1 rather than localhost. Using "localhost" is problematic in Travis CI, where they have /etc/hosts configured to make `localhost` resolve to both 127.0.0.1 and ::1. --- tools/run-dev.py | 12 ++++++------ tools/webpack.config.js | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/run-dev.py b/tools/run-dev.py index 2323166c41..58ce297ce6 100755 --- a/tools/run-dev.py +++ b/tools/run-dev.py @@ -96,11 +96,11 @@ os.setpgrp() # zulip/urls.py. cmds = [['./tools/compile-handlebars-templates', 'forever'], ['python', 'manage.py', 'rundjango'] + - manage_args + ['localhost:%d' % (django_port,)], + manage_args + ['127.0.0.1:%d' % (django_port,)], ['python', '-u', 'manage.py', 'runtornado'] + - manage_args + ['localhost:%d' % (tornado_port,)], + manage_args + ['127.0.0.1:%d' % (tornado_port,)], ['./tools/run-dev-queue-processors'] + manage_args, - ['env', 'PGHOST=localhost', # Force password authentication using .pgpass + ['env', 'PGHOST=127.0.0.1', # Force password authentication using .pgpass './puppet/zulip/files/postgresql/process_fts_updates']] if options.test: # Webpack doesn't support 2 copies running on the same system, so @@ -123,13 +123,13 @@ class Resource(resource.Resource): request.uri.startswith('/json/events') or request.uri.startswith('/api/v1/events') or request.uri.startswith('/sockjs')): - return proxy.ReverseProxyResource('localhost', tornado_port, '/'+name) + return proxy.ReverseProxyResource('127.0.0.1', tornado_port, '/'+name) elif (request.uri.startswith('/webpack') or request.uri.startswith('/socket.io')): - return proxy.ReverseProxyResource('localhost', webpack_port, '/'+name) + return proxy.ReverseProxyResource('127.0.0.1', webpack_port, '/'+name) - return proxy.ReverseProxyResource('localhost', django_port, '/'+name) + return proxy.ReverseProxyResource('127.0.0.1', django_port, '/'+name) try: reactor.listenTCP(proxy_port, server.Site(Resource()), interface=options.interface) diff --git a/tools/webpack.config.js b/tools/webpack.config.js index d34f1f9cca..403535eb99 100644 --- a/tools/webpack.config.js +++ b/tools/webpack.config.js @@ -1,11 +1,11 @@ module.exports = { entry: [ - 'webpack-dev-server/client?http://localhost:9991/socket.io', + 'webpack-dev-server/client?http://127.0.0.1:9991/socket.io', './static/js/src/main.js' ], devtool: 'eval', output: { - publicPath: 'http://localhost:9991/webpack/', + publicPath: 'http://127.0.0.1:9991/webpack/', path: './static/js', filename: 'bundle.js' },