From 39f986a88d37f3199f0bcc9bf2623146ec7034a0 Mon Sep 17 00:00:00 2001 From: Fabio Manganiello Date: Thu, 4 Jan 2018 17:20:35 +0100 Subject: [PATCH] Fixed HTTP backend --- platypush/backend/http/__init__.py | 68 +++++++++++++++++------------- 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/platypush/backend/http/__init__.py b/platypush/backend/http/__init__.py index 84f41f2458..5e5bdae612 100644 --- a/platypush/backend/http/__init__.py +++ b/platypush/backend/http/__init__.py @@ -1,9 +1,11 @@ import logging import json +import time from multiprocessing import Process from flask import Flask, abort, jsonify, request +from platypush.config import Config from platypush.message import Message from platypush.message.request import Request @@ -12,7 +14,7 @@ from .. import Backend class HttpBackend(Backend): """ Example interaction with the HTTP backend to make requests: - $ curl -XPOST \ + $ curl -XPOST -d "token=your_configured_token" \ -d 'msg={"type":"request","target":"volta","action":"tts.say","args": {"phrase":"This is a test"}}' \ http://localhost:8008 """ @@ -20,44 +22,50 @@ class HttpBackend(Backend): super().__init__(**kwargs) self.port = port self.token = token + self.server_proc = None def send_message(self, msg): - raise NotImplementedError('Use cURL or any HTTP client to query the HTTP backend') + logging.warning('Use cURL or any HTTP client to query the HTTP backend') - def _start_server(self): - def app_main(): - app = Flask(__name__) + def stop(self): + logging.info('Received STOP event on HttpBackend') + if self.server_proc: + self.server_proc.terminate() + self.server_proc.join() - @app.route('/', methods=['POST']) - def index(): - args = { k:v for (k,v) in request.form.items() } - - if self.token: - if 'token' not in args or args['token'] != self.token: - abort(401) - - if 'msg' not in args: - abort(400) - - msg = Message.build(args['msg']) - logging.debug('Received message on HTTP backend: {}'.format(msg)) - - if isinstance(msg, Request): - response = msg.execute(async=False) - return str(response) - - return jsonify({ 'status': 'ok' }) - - app.run(debug=True, host='0.0.0.0', port=self.port) - logging.info('Initialized HTTP backend on port {}'.format(self.port)) - - return app_main def run(self): super().run() - self.server_proc = Process(target=self._start_server()) + + app = Flask(__name__) + + @app.route('/', methods=['POST']) + def index(): + args = { k:v for (k,v) in request.form.items() } + + if self.token and ('token' not in args or args['token'] != self.token): abort(401) + if 'msg' not in args: abort(400) + + msg = Message.build(args['msg']) + logging.info('Received message on the HTTP backend: {}'.format(msg)) + + if isinstance(msg, Request): + response = msg.execute(async=False) + logging.info('Processing response on the HTTP backend: {}'.format(msg)) + return str(response) + + return jsonify({ 'status': 'ok' }) + + logging.info('Initialized HTTP backend on port {}'.format(self.port)) + + self.server_proc = Process(target=app.run, kwargs={ + 'debug':True, 'host':'0.0.0.0', 'port':self.port + }) + + time.sleep(1) + self.server_proc.start() self.server_proc.join()