Skip to content

Commit

Permalink
erxes-message-broker has prefix (erxes#2592)
Browse files Browse the repository at this point in the history
  • Loading branch information
@munkhsaikhan
munkhsaikhan authored Jan 19, 2021
1 parent 1ae15e9 commit a05ab79
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 38 deletions.
2 changes: 1 addition & 1 deletion api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"elasticsearch": "^16.6.0",
"erxes-api-utils": "^0.0.18",
"erxes-inmemory-storage": "^1.0.16",
"erxes-message-broker": "^1.0.18",
"erxes-message-broker": "^1.0.20",
"erxes-telemetry": "^1.0.4",
"express": "^4.17.1",
"faker": "^4.1.0",
Expand Down
13 changes: 5 additions & 8 deletions api/src/messageBroker.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
receiveIntegrationsNotification,
receiveRpcMessage
} from './data/modules/integrations/receiveMessage';
import { getEnv } from './data/utils';
import { pluginsConsume } from './pluginUtils';
import { graphqlPubsub } from './pubsub';

Expand All @@ -20,29 +19,27 @@ export const initBroker = async (server?) => {
envs: process.env
});

const prefix = getEnv({ name: 'MESSAGE_BROKER_PREFIX' })

const { consumeQueue, consumeRPCQueue } = client;

// listen for rpc queue =========
consumeRPCQueue('rpc_queue:integrations_to_api'.concat(prefix), async data =>
consumeRPCQueue('rpc_queue:integrations_to_api', async data =>
receiveRpcMessage(data)
);

// graphql subscriptions call =========
consumeQueue('callPublish'.concat(prefix), params => {
consumeQueue('callPublish', params => {
graphqlPubsub.publish(params.name, params.data);
});

consumeQueue('integrationsNotification'.concat(prefix), async data => {
consumeQueue('integrationsNotification', async data => {
await receiveIntegrationsNotification(data);
});

consumeQueue('engagesNotification'.concat(prefix), async data => {
consumeQueue('engagesNotification', async data => {
await receiveEngagesNotification(data);
});

pluginsConsume(client, prefix);
pluginsConsume(client);
};

export default function () {
Expand Down
6 changes: 3 additions & 3 deletions api/src/pluginUtils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ export const extendViaPlugins = (app, resolvers, typeDefDetails): Promise<any> =
});
});

export const pluginsConsume = (client, prefix) => {
export const pluginsConsume = (client) => {
const { consumeQueue, consumeRPCQueue } = client;
const context = {
models: allModels,
Expand All @@ -338,13 +338,13 @@ export const pluginsConsume = (client, prefix) => {

if (mbroker.method === "RPCQueue") {
consumeRPCQueue(
channel.concat(prefix),
channel,
async msg => mbroker.handler(msg, context)
);

} else {
consumeQueue(
channel.concat(prefix),
channel,
async msg => await mbroker.handler(msg, context)
);
}
Expand Down
20 changes: 10 additions & 10 deletions api/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2656,9 +2656,9 @@ cron-parser@^2.7.3:
moment-timezone "^0.5.25"

cross-env@^7.0.2:
version "7.0.2"
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.2.tgz#bd5ed31339a93a3418ac4f3ca9ca3403082ae5f9"
integrity sha512-KZP/bMEOJEDCkDQAyRhu3RL2ZO/SUVrxQVI0G3YEQ+OLbRA3c6zgixe8Mq8a/z7+HKlNEjo8oiLUs8iRijY2Rw==
version "7.0.3"
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
dependencies:
cross-spawn "^7.0.1"

Expand Down Expand Up @@ -3203,10 +3203,10 @@ erxes-inmemory-storage@^1.0.16:
"@babel/runtime" "^7.11.2"
redis "^3.0.2"

erxes-message-broker@^1.0.18:
version "1.0.18"
resolved "https://registry.yarnpkg.com/erxes-message-broker/-/erxes-message-broker-1.0.18.tgz#d77374cbe59a9c6ff7fc507ecc5876547310369b"
integrity sha512-zvDPkhv5YExqXRzaWSgaQhH1uQjLNW++UrhyJnkdcu6zNVw4vLFkWEfhV30Rrd+tscQNvOTpuBXjnB/ue5cPzg==
erxes-message-broker@^1.0.20:
version "1.0.20"
resolved "https://registry.yarnpkg.com/erxes-message-broker/-/erxes-message-broker-1.0.20.tgz#df595e1eea2c1c2a50c1f447f0883a69a57f536f"
integrity sha512-qqIXPEJLwY1VKo6khgnVz6/xV4adKzwxyWSBrYW9mdk/+QDhertlmE3RD23/TK3bqoTZ5sOltDVN6ErgWVveKg==
dependencies:
"@babel/runtime" "^7.11.2"
amqplib "^0.6.0"
Expand Down Expand Up @@ -8848,9 +8848,9 @@ [email protected], uuid@^3.1.0, uuid@^3.3.2, uuid@^3.3.3:
integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==

uuid@^8.3.0:
version "8.3.0"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea"
integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==
version "8.3.2"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==

validate-npm-package-license@^3.0.1:
version "3.0.4"
Expand Down
2 changes: 1 addition & 1 deletion engages-email-sender/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"body-parser": "^1.17.1",
"debug": "^4.1.1",
"dotenv": "^4.0.0",
"erxes-message-broker": "^1.0.17",
"erxes-message-broker": "^1.0.20",
"express": "^4.16.4",
"faker": "^4.1.0",
"meteor-random": "^0.0.3",
Expand Down
8 changes: 4 additions & 4 deletions engages-email-sender/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1483,10 +1483,10 @@ error-ex@^1.2.0, error-ex@^1.3.1:
dependencies:
is-arrayish "^0.2.1"

erxes-message-broker@^1.0.17:
version "1.0.17"
resolved "https://registry.yarnpkg.com/erxes-message-broker/-/erxes-message-broker-1.0.17.tgz#2407312163d010f292e153cf1b45e33e0fb16f63"
integrity sha512-UdA5nRLn1tn5pqnDM+hR6LTrkiiOduVBanvAjxlvZujv6bUP+SdKzf17VWQhk4/3jZMmWzHIBZ0vpzHbHaVQTg==
erxes-message-broker@^1.0.20:
version "1.0.20"
resolved "https://registry.yarnpkg.com/erxes-message-broker/-/erxes-message-broker-1.0.20.tgz#df595e1eea2c1c2a50c1f447f0883a69a57f536f"
integrity sha512-qqIXPEJLwY1VKo6khgnVz6/xV4adKzwxyWSBrYW9mdk/+QDhertlmE3RD23/TK3bqoTZ5sOltDVN6ErgWVveKg==
dependencies:
"@babel/runtime" "^7.11.2"
amqplib "^0.6.0"
Expand Down
2 changes: 1 addition & 1 deletion integrations/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"debug": "^4.1.1",
"dotenv": "^4.0.0",
"erxes-inmemory-storage": "^1.0.16",
"erxes-message-broker": "^1.0.18",
"erxes-message-broker": "^1.0.20",
"express": "^4.16.4",
"fbgraph": "^1.4.4",
"formidable": "^1.2.1",
Expand Down
8 changes: 4 additions & 4 deletions integrations/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1850,10 +1850,10 @@ erxes-inmemory-storage@^1.0.16:
"@babel/runtime" "^7.11.2"
redis "^3.0.2"

erxes-message-broker@^1.0.18:
version "1.0.18"
resolved "https://registry.yarnpkg.com/erxes-message-broker/-/erxes-message-broker-1.0.18.tgz#d77374cbe59a9c6ff7fc507ecc5876547310369b"
integrity sha512-zvDPkhv5YExqXRzaWSgaQhH1uQjLNW++UrhyJnkdcu6zNVw4vLFkWEfhV30Rrd+tscQNvOTpuBXjnB/ue5cPzg==
erxes-message-broker@^1.0.20:
version "1.0.20"
resolved "https://registry.yarnpkg.com/erxes-message-broker/-/erxes-message-broker-1.0.20.tgz#df595e1eea2c1c2a50c1f447f0883a69a57f536f"
integrity sha512-qqIXPEJLwY1VKo6khgnVz6/xV4adKzwxyWSBrYW9mdk/+QDhertlmE3RD23/TK3bqoTZ5sOltDVN6ErgWVveKg==
dependencies:
"@babel/runtime" "^7.11.2"
amqplib "^0.6.0"
Expand Down
4 changes: 2 additions & 2 deletions logger/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"cote": "^1.0.0",
"debug": "^4.1.1",
"dotenv": "^4.0.0",
"erxes-message-broker": "^1.0.17",
"erxes-message-broker": "^1.0.20",
"express": "^4.16.4",
"migrate": "^1.6.2",
"mongoose": "5.7.10",
Expand All @@ -38,4 +38,4 @@
"ts-node-dev": "^1.0.0-pre.32",
"typescript": "^2.9.2"
}
}
}
8 changes: 4 additions & 4 deletions logger/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -617,10 +617,10 @@ error-ex@^1.2.0:
dependencies:
is-arrayish "^0.2.1"

erxes-message-broker@^1.0.17:
version "1.0.17"
resolved "https://registry.yarnpkg.com/erxes-message-broker/-/erxes-message-broker-1.0.17.tgz#2407312163d010f292e153cf1b45e33e0fb16f63"
integrity sha512-UdA5nRLn1tn5pqnDM+hR6LTrkiiOduVBanvAjxlvZujv6bUP+SdKzf17VWQhk4/3jZMmWzHIBZ0vpzHbHaVQTg==
erxes-message-broker@^1.0.20:
version "1.0.20"
resolved "https://registry.yarnpkg.com/erxes-message-broker/-/erxes-message-broker-1.0.20.tgz#df595e1eea2c1c2a50c1f447f0883a69a57f536f"
integrity sha512-qqIXPEJLwY1VKo6khgnVz6/xV4adKzwxyWSBrYW9mdk/+QDhertlmE3RD23/TK3bqoTZ5sOltDVN6ErgWVveKg==
dependencies:
"@babel/runtime" "^7.11.2"
amqplib "^0.6.0"
Expand Down

0 comments on commit a05ab79

Please sign in to comment.