From 6e1b6686c2e392589f9862e8500300e8e3bd9257 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Thu, 21 Feb 2019 16:15:06 +0100 Subject: [PATCH] Revert "Running Flask webserver in another thread instead than another process" This reverts commit 0a5c42fdfda00ac33a5c0ba9fa26966c66c71cfd. --- platypush/backend/http/__init__.py | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/platypush/backend/http/__init__.py b/platypush/backend/http/__init__.py index b88882b89..25964511b 100644 --- a/platypush/backend/http/__init__.py +++ b/platypush/backend/http/__init__.py @@ -152,8 +152,8 @@ class HttpBackend(Backend): self.redis_queue = redis_queue self.dashboard = dashboard self.maps = maps + self.server_proc = None self.disable_websocket = disable_websocket - self.webserver_thread = None self.websocket_thread = None self.redis_thread = None self.redis = None @@ -192,12 +192,9 @@ class HttpBackend(Backend): if redis: redis.rpush(self.redis_queue, str(stop_evt)) - if self.app: - stop_func = request.environ.get('werkzeug.server.shutdown') - if stop_func is None: - self.logger.warning('Werkzeug server not running') - return - stop_func() + if self.server_proc: + self.server_proc.terminate() + self.server_proc.join() def notify_web_clients(self, event): """ Notify all the connected web clients (over websocket) of a new event """ @@ -758,17 +755,11 @@ class HttpBackend(Backend): loop.run_forever() def run(self): - def server_thread(**kwargs): - self.app = self.webserver() - self.app.debug = False - self.app.run(**kwargs) - super().run() os.putenv('FLASK_APP', 'platypush') os.putenv('FLASK_ENV', 'production') kwargs = { - 'host':'0.0.0.0', 'port':self.port, - 'use_reloader':False, 'threaded':True, + 'host':'0.0.0.0', 'port':self.port, 'use_reloader':False } if self.ssl_context: @@ -776,15 +767,18 @@ class HttpBackend(Backend): self.logger.info('Initialized HTTP backend on port {}'.format(self.port)) - self.webserver_thread = threading.Thread(target=server_thread(**kwargs), - name='WebServer') - self.webserver_thread.start() + self.app = self.webserver() + self.app.debug = False + self.server_proc = Process(target=self.app.run, + name='WebServer', + kwargs=kwargs) + self.server_proc.start() if not self.disable_websocket: self.websocket_thread = threading.Thread(target=self.websocket) self.websocket_thread.start() - self.webserver_thread.join() + self.server_proc.join() class HttpUtils(object):