[backend] Improve RabbitMQ consume to prevent error on none classic q…

…ueue type (#4706)
OpenCTI-Platform · Oct 20, 2023 · b7159c9 · b7159c9
1 parent 975bb42
commit b7159c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/opencti-platform/opencti-graphql/src/connector/importCsv/importCsv-connector.ts b/opencti-platform/opencti-graphql/src/connector/importCsv/importCsv-connector.ts
@@ -107,6 +107,7 @@ const initImportCsvConnector = () => {
 
   const handleCsvImport = async (context: AuthContext) => {
     consumeQueue(context, connector.id, connectionSetterCallback, consumeQueueCallback).catch(() => {
+      if (rabbitMqConnection) rabbitMqConnection.close();
       setTimeout(handleCsvImport, RETRY_CONNECTION_PERIOD);
     });
   };

diff --git a/opencti-platform/opencti-graphql/src/database/rabbitmq.js b/opencti-platform/opencti-graphql/src/database/rabbitmq.js
@@ -255,14 +255,13 @@ export const consumeQueue = async (context, connectorId, connectionSetterCallbac
               channel.on('error', (onChannelError) => {
                 reject(onChannelError);
               });
-              channel.assertQueue(listenQueue);
               channel.consume(listenQueue, (data) => {
                 if (data !== null) {
                   callback(context, data.content.toString());
                 }
               }, { noAck: true }, (consumeError) => {
                 if (consumeError) {
-                  logApp.error('CONNECTOR_CONSUMER_QUEUE_ERROR', { error: consumeError, connector: cfg.name });
+                  logApp.error('CONNECTOR_CONSUMER_QUEUE_CONSUME', { error: consumeError });
                 }
               });
             }