Merge branch 'dev' of github.com:erxes/erxes into dev

erxes · Oct 2, 2023 · 2e74335 · 2e74335
2 parents bca1756 + 09f1868
commit 2e74335
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/packages/api-utils/src/messageBroker.ts b/packages/api-utils/src/messageBroker.ts
@@ -413,6 +413,7 @@ RabbitListener.prototype.connect = function(RABBITMQ_HOST) {
           console.log(`Connected to rabbitmq server ${RABBITMQ_HOST}`);
 
           conn.on('error', me.reconnect.bind(me, RABBITMQ_HOST));
+          conn.on('close', me.reconnect.bind(me, RABBITMQ_HOST));
 
           return conn.createChannel().then(function(chan) {
             channel = chan;

diff --git a/packages/plugin-engages-api/src/emailUtils.ts b/packages/plugin-engages-api/src/emailUtils.ts
@@ -73,7 +73,7 @@ export const prepareEmailParams = (
 
   return {
     from: `${sender} <${fromEmail}>`,
-    to: customer.primaryEmail.toLocaleLowerCase().trim(),
+    to: (customer?.primaryEmail || '').toLocaleLowerCase().trim(),
     replyTo,
     subject: replacedSubject,
     attachments: prepareAttachments(attachments),

diff --git a/packages/plugin-engages-api/src/sender.ts b/packages/plugin-engages-api/src/sender.ts
@@ -301,10 +301,10 @@ export const sendEmail = async (models: IModels, data: any) => {
       prepareEmailParams(customer, data, configs.configSet)
     );
 
-    debugEngages(`Sent email to: ${customer.primaryEmail}`);
+    debugEngages(`Sent email to: ${customer?.primaryEmail}`);
   } catch (e) {
     debugError(
-      `Error occurred while sending email to ${customer.primaryEmail}: ${e.message}`
+      `Error occurred while sending email to ${customer?.primaryEmail}: ${e.message}`
     );
   }
 };