Rest Gateway: removed message list and changed messaging

Fixed trace forwarding to Trace Retrieval; disabled message receiver

rest-gateway/app/configs/swagger.yml

@@ -15,7 +15,7 @@ basePath: "/api"
 paths:
   /debug:
     post:
-      operationId: "debug.echo"
+      operationId: "rest.debug.echo"
       tags:
         - "Echo"
       summary: "Echo function for debugging purposes"
@@ -30,17 +30,6 @@ paths:
         200:
           description: "Successful echo of request data"
   
-  /messages:
-    get:
-      operationId: "debug.get_messages"
-      tags:
-        - "Received Messages"
-      summary: "List of all received messages"
-      description: "Lists all messages received from Rabbit MQ."
-      responses:
-        200:
-          description: "Message list"
-          
   /trace:
     post:
         operationId: "rest.blockchain_trace.receive"

rest-gateway/app/main.py

@@ -8,28 +8,33 @@ if os.path.exists(modules_path):
 # init logging to file
 import logging
 LOG_FORMAT = ('%(levelname) -5s %(asctime)s %(name)s:%(funcName) -35s %(lineno) -5d:  %(message)s')
-logging.basicConfig(
-    filename='error.log', 
-    level=logging.INFO, format=LOG_FORMAT)
+logging.basicConfig(level=logging.INFO, format=LOG_FORMAT)
 LOGGER = logging.getLogger(__name__)
 
+#################################
 import connexion
-from multiprocessing import Process
 from messaging.MessageReceiver import MessageReceiver
 from messaging.MessageSender import MessageSender
 from MessageList import MessageList
 
-messages = MessageList.getInstance()
+message_rec: MessageReceiver = None
 
 # init message handler
 def message_received_callback(channel, method, properties, body):
-    messages.appendMessage(body)
     print(f"### Received: {body}")
+    # TODO
 
 def pika_error_callback(error):
-    # TODO gracefully handle error
-    print("Rabbit MQ error!")
-    os._exit(1)
+    LOGGER.warning(f"RabbitMQ stopped with error: {error}")
+    # restart receiver
+    global message_rec
+    message_rec.stop()
+    init_message_receiver()
+
+def init_message_receiver():
+    global message_rec
+    message_rec = MessageReceiver(exchange_name='rest-gateway', exchange_type='direct', queue_name='rest-gateway', auto_ack=True)
+    message_rec.start(message_received_callback, pika_error_callback)
 
 # load swagger config 
 app = connexion.App(__name__, specification_dir='configs/')
@@ -41,7 +46,4 @@ def api_root():
 
 # start app
 if __name__ == '__main__':
-    message_rec = MessageReceiver(exchange_name='rest-gateway', exchange_type='direct', queue_name='rest-gateway', auto_ack=True)
-    message_rec.start(message_received_callback, pika_error_callback)
-
     app.run(host='0.0.0.0', port=5000, debug=True, use_reloader=False) # disable reloader so only subscribed once to rabbitmq
\ No newline at end of file

rest-gateway/app/rest/blockchain_trace.py

 from flask import request, Response
 from messaging.MessageSender import MessageSender
 import json
-# import main
 
 message_sender = MessageSender()
 message_sender.connect()
@@ -9,8 +8,9 @@ message_sender.create_exchange('inhub', 'direct')
 
 def receive():
     body = request.json
+    
     if isBlockchainTraceValid(body):
-        message = {'type': 'blockchain-transaction', 'content': json.dumps(body)}
+        message = {'type': 'blockchain-transaction', 'content': body}
         message_sender.send('inhub', json.dumps(message), 'trace-retrieval')
         return Response(status=201)
         
@@ -29,5 +29,3 @@ def isBlockchainTraceValid(trace) -> bool:
         and 'ResourceMd5' in trace \
         and 'ResourceState' in trace \
         and 'Metadata' in trace
-
-

transaction-hub-in/trace-retrieval-microservice/app/messaging/MessageHandler.py

@@ -17,15 +17,17 @@ class MessageHandler:
         try:
             message = json.loads(body)
         except ValueError:
-            LOGGER.warning(f"Message is not in JSON format and is ignored")
+            LOGGER.warning("Message is not in JSON format and is ignored")
             return
 
         if not 'type' in message:
-            LOGGER.warning(f"Message has no type field and is ignored")
+            LOGGER.warning("Message has no type field and is ignored")
             return
         
         if message['type'] == 'blockchain-transaction':
             self.handle_blockchain_transaction(message['content'])
+        else:
+            LOGGER.info("Message Type could not be processed")
             
     def handle_blockchain_transaction(self, transaction):
         self._mongo_repo.insert_trace(transaction)