forked from platypush/platypush
Renamed app->application for the main Flask webapp to make sure that the default uwsgi configuration can pick it up
This commit is contained in:
parent
d5c31d938b
commit
c74b939660
2 changed files with 6 additions and 6 deletions
|
@ -4,7 +4,7 @@ import threading
|
||||||
from multiprocessing import Process
|
from multiprocessing import Process
|
||||||
|
|
||||||
from platypush.backend import Backend
|
from platypush.backend import Backend
|
||||||
from platypush.backend.http.app import app
|
from platypush.backend.http.app import application
|
||||||
from platypush.context import get_or_create_event_loop
|
from platypush.context import get_or_create_event_loop
|
||||||
from platypush.utils import get_ssl_server_context, set_thread_name
|
from platypush.utils import get_ssl_server_context, set_thread_name
|
||||||
|
|
||||||
|
@ -208,7 +208,7 @@ class HttpBackend(Backend):
|
||||||
if self.ssl_context:
|
if self.ssl_context:
|
||||||
kwargs['ssl_context'] = self.ssl_context
|
kwargs['ssl_context'] = self.ssl_context
|
||||||
|
|
||||||
app.run(**kwargs)
|
application.run(**kwargs)
|
||||||
|
|
||||||
return proc
|
return proc
|
||||||
|
|
||||||
|
|
|
@ -14,15 +14,15 @@ base_folder = os.path.abspath(os.path.join(
|
||||||
template_folder = os.path.join(base_folder, 'templates')
|
template_folder = os.path.join(base_folder, 'templates')
|
||||||
static_folder = os.path.join(base_folder, 'static')
|
static_folder = os.path.join(base_folder, 'static')
|
||||||
|
|
||||||
app = Flask('platypush', template_folder=template_folder,
|
application = Flask('platypush', template_folder=template_folder,
|
||||||
static_folder=static_folder)
|
static_folder=static_folder)
|
||||||
|
|
||||||
for route in get_routes():
|
for route in get_routes():
|
||||||
app.register_blueprint(route)
|
application.register_blueprint(route)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
app.run()
|
application.run()
|
||||||
|
|
||||||
|
|
||||||
# vim:sw=4:ts=4:et:
|
# vim:sw=4:ts=4:et:
|
||||||
|
|
Loading…
Reference in a new issue