Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

run-dev: Fix minor whitespace issues.

This commit is contained in:
Tim Abbott 2016-11-01 20:27:44 -07:00
parent 2f711a070d
commit 6a8f8c2abf
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/run-dev.py
View File

@ -42,16 +42,16 @@ to this file.
""") """)
parser.add_option('--test', parser.add_option('--test',
action='store_true', dest='test', action='store_true', dest='test',
help='Use the testing database and ports') help='Use the testing database and ports')
parser.add_option('--interface', parser.add_option('--interface',
action='store', dest='interface', action='store', dest='interface',
default=None, help='Set the IP or hostname for the proxy to listen on') default=None, help='Set the IP or hostname for the proxy to listen on')
parser.add_option('--no-clear-memcached', parser.add_option('--no-clear-memcached',
action='store_false', dest='clear_memcached', action='store_false', dest='clear_memcached',
default=True, help='Do not clear memcached') default=True, help='Do not clear memcached')
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
@ -67,9 +67,9 @@ if options.interface is None:
# Otherwise, only listen to requests on localhost for security. # Otherwise, only listen to requests on localhost for security.
options.interface = "127.0.0.1" options.interface = "127.0.0.1"
base_port = 9991 base_port = 9991
if options.test: if options.test:
base_port = 9981 base_port = 9981
settings_module = "zproject.test_settings" settings_module = "zproject.test_settings"
else: else:
settings_module = "zproject.settings" settings_module = "zproject.settings"
@ -81,10 +81,10 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
from scripts.lib.zulip_tools import WARNING, ENDC from scripts.lib.zulip_tools import WARNING, ENDC
proxy_port = base_port proxy_port = base_port
django_port = base_port+1 django_port = base_port + 1
tornado_port = base_port+2 tornado_port = base_port + 2
webpack_port = base_port+3 webpack_port = base_port + 3
os.chdir(os.path.join(os.path.dirname(__file__), '..')) os.chdir(os.path.join(os.path.dirname(__file__), '..'))
@ -109,9 +109,9 @@ os.setpgrp()
# zulip/urls.py. # zulip/urls.py.
cmds = [['./tools/compile-handlebars-templates', 'forever'], cmds = [['./tools/compile-handlebars-templates', 'forever'],
['python', 'manage.py', 'rundjango'] + ['python', 'manage.py', 'rundjango'] +
manage_args + ['127.0.0.1:%d' % (django_port,)], manage_args + ['127.0.0.1:%d' % (django_port,)],
['python', '-u', 'manage.py', 'runtornado'] + ['python', '-u', 'manage.py', 'runtornado'] +
manage_args + ['127.0.0.1:%d' % (tornado_port,)], manage_args + ['127.0.0.1:%d' % (tornado_port,)],
['./tools/run-dev-queue-processors'] + manage_args, ['./tools/run-dev-queue-processors'] + manage_args,
['env', 'PGHOST=127.0.0.1', # Force password authentication using .pgpass ['env', 'PGHOST=127.0.0.1', # Force password authentication using .pgpass
'./puppet/zulip/files/postgresql/process_fts_updates']] './puppet/zulip/files/postgresql/process_fts_updates']]