Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use SERVER_NAME to set host and port in app.run() #2152

Merged
merged 5 commits into from
Jan 17, 2017
Merged

use SERVER_NAME to set host and port in app.run() #2152

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
823d6e0
use SERVER_CONFIG in app run()
r0fls Jan 16, 2017
a0494ba
servername -> server_name
r0fls Jan 16, 2017
b6aec54
split -> partition
r0fls Jan 16, 2017
e3e225c
keep all three variables separate
r0fls Jan 17, 2017
3a48831
add sn_host and sn_port defaults
r0fls Jan 17, 2017
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
16 changes: 8 additions & 8 deletions flask/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,14 +825,14 @@ def run(self, host=None, port=None, debug=None, **options):
information.
"""
from werkzeug.serving import run_simple
if host is None:
host = '127.0.0.1'
if port is None:
server_name = self.config['SERVER_NAME']
if server_name and ':' in server_name:
port = int(server_name.rsplit(':', 1)[1])
else:
port = 5000
_host = '127.0.0.1'
_port = 5000
server_name = self.config.get("SERVER_NAME")
sn_host, sn_port = None, None
if server_name:
sn_host, _, sn_port = server_name.partition(':')
host = host or sn_host or _host

This comment was marked as off-topic.

Sign in to view

port = int(port or sn_port or _port)
if debug is not None:
self.debug = bool(debug)
options.setdefault('use_reloader', self.debug)
Expand Down