[client] Send heartbeat to AMQP in long tasks

Author: SamuelHassine

pycti/connector/opencti_connector_helper.py

@@ -228,6 +228,7 @@ def _process_message(self, channel, method, properties, body) -> None:
         time_wait = 0
         # Wait for end of execution of the _data_handler
         while self.thread.is_alive():  # Loop while the thread is processing
+            self.pika_connection.sleep(0.05)
             if (
                 self.helper.work_id is not None and time_wait > five_minutes
             ):  # Ping every 5 minutes
@@ -312,10 +313,12 @@ def run(self) -> None:
                 )
                 self.channel.start_consuming()
             except (KeyboardInterrupt, SystemExit):
+                self.channel.stop_consuming()
                 LOGGER.info("Connector stop")
                 sys.exit(0)
             except Exception as err:  # pylint: disable=broad-except
                 LOGGER.error("%s", err)
+            self.pika_connection.close()
 
     def stop(self):
         self.exit_event.set()

pycti/entities/opencti_indicator.py

@@ -142,7 +142,7 @@ def __init__(self, opencti):
                 }
             }
         """
-        self.properties = """
+        self.properties_with_files = """
             id
             standard_id
             entity_type