maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Merge pull request #2707 from rochacbruno/lazy_loader_message

Browse source 
Add a message `Serving Flask app (module "app.py" will be lazily loaded)` to `flask run` related to #2706
This commit is contained in:
David Lord 2018-04-18 13:45:35 -07:00 • committed by GitHub
commit e102e5cb33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flask/app.py
View file

@ -933,7 +933,7 @@ class Flask(_PackageBoundObject):
options.setdefault('use_debugger', self.debug) options.setdefault('use_debugger', self.debug)
options.setdefault('threaded', True) options.setdefault('threaded', True)
cli.show_server_banner(self.env, self.debug, self.name) cli.show_server_banner(self.env, self.debug, self.name, False)
from werkzeug.serving import run_simple from werkzeug.serving import run_simple

15
flask/cli.py
View file

@ -614,7 +614,7 @@ def load_dotenv(path=None):
return new_dir is not None # at least one file was located and loaded return new_dir is not None # at least one file was located and loaded
def show_server_banner(env, debug, app_import_path): def show_server_banner(env, debug, app_import_path, eager_loading):
"""Show extra startup messages the first time the server is run, """Show extra startup messages the first time the server is run,
ignoring the reloader. ignoring the reloader.
""" """
@ -622,9 +622,14 @@ def show_server_banner(env, debug, app_import_path):
return return
if app_import_path is not None: if app_import_path is not None:
print(' * Serving Flask app "{0}"'.format(app_import_path)) message = ' * Serving Flask app "{0}"'.format(app_import_path)
print(' * Environment: {0}'.format(env)) if not eager_loading:
message += ' (lazy loading)'
click.echo(message)
click.echo(' * Environment: {0}'.format(env))
if env == 'production': if env == 'production':
click.secho( click.secho(
@ -633,7 +638,7 @@ def show_server_banner(env, debug, app_import_path):
click.secho(' Use a production WSGI server instead.', dim=True) click.secho(' Use a production WSGI server instead.', dim=True)
if debug is not None: if debug is not None:
print(' * Debug mode: {0}'.format('on' if debug else 'off')) click.echo(' * Debug mode: {0}'.format('on' if debug else 'off'))
class CertParamType(click.ParamType): class CertParamType(click.ParamType):
@ -759,7 +764,7 @@ def run_command(info, host, port, reload, debugger, eager_loading,
if eager_loading is None: if eager_loading is None:
eager_loading = not reload eager_loading = not reload
show_server_banner(get_env(), debug, info.app_import_path) show_server_banner(get_env(), debug, info.app_import_path, eager_loading)
app = DispatchingApp(info.load_app, use_eager_loading=eager_loading) app = DispatchingApp(info.load_app, use_eager_loading=eager_loading)
from werkzeug.serving import run_simple from werkzeug.serving import run_simple