From db46aea55bbf98163908253b5ad40c59ba0843e7 Mon Sep 17 00:00:00 2001 From: Migatu Date: Wed, 10 Apr 2024 13:16:32 +0200 Subject: [PATCH] Start work on views --- communication_subroutine.py | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/communication_subroutine.py b/communication_subroutine.py index deb790e..7e24705 100644 --- a/communication_subroutine.py +++ b/communication_subroutine.py @@ -1,7 +1,7 @@ import logging import threading import json -from queue import Queue +from queue import Queue, Empty from flask import Flask, jsonify, request from waitress import serve @@ -9,21 +9,24 @@ HOST_ADDRESS = "192.168.1.191" PORT_ADDRESS = 5000 OUT_COMM_Q = Queue() IN_COMM_Q = Queue() - +internal_q = Queue() app = Flask(__name__) @app.route("/conjurer", methods=["POST"]) def answer_external_command(): record = json.loads(request.data) app.logger.info(record) - #if "UUID" in record and "QUERY" in record and "AUTHOR" in record: - # answer_data = "Query logged" - #return_data = ( - # jsonify(isError=False, message="Success", statusCode=200, data=answer_data), - # 200, - #) - #return return_data app.logger.info("DATA RECEIVED") + + + while True: + try: + q_data = internal_q.get(block=False) + except Empty: + break + if q_data.uuid in record: + pass + return jsonify("SUCCESS") @app.route("/conjurer", methods=["GET"]) @@ -52,13 +55,15 @@ def scan_queue(_logger): while True: data = OUT_COMM_Q.get() _logger.info(data) + internal_q.put(data) + query_list.append(data) def comm_subroutine(logger): #logger.setLevel(logging.DEBUG) logger.info("Started") threads = [] - #threads.append(threading.Thread(target=flask_debug, args=(logger,))) - threads.append(threading.Thread(target=waitress_run, args=(logger,))) + threads.append(threading.Thread(target=flask_debug, args=(logger,))) + #threads.append(threading.Thread(target=waitress_run, args=(logger,))) threads.append(threading.Thread(target=scan_queue,args=(logger,))) for worker in threads: