Skip to content

Commit 3062201

Browse files
revert changes to 3b03a37
1 parent fe939da commit 3062201

18 files changed

+173
-928
lines changed

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,6 @@ export RABBIT_HOST=0.0.0.0
203203
export RABBIT_PORT=5672
204204
export RABBIT_USERNAME=root
205205
export RABBIT_PASSWORD=toor
206-
# these commands are for reconnecting test
207-
export START_RABBIT_COMMAND="docker start rabbitmq"
208-
export STOP_RABBIT_COMMAND="docker stop rabbitmq"
209206
```
210207

211208
and perform:

index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ module.exports = function () {
1313
container.register("servicePubQueueRabbit", require("./lib/service_pub_queue_rabbit"));
1414
container.register("serviceSubQueueRabbit", require("./lib/service_sub_queue_rabbit"));
1515
container.alias("serviceSubQueue", "serviceSubQueueRabbit");
16+
17+
container.register("amqp", require("./lib/service_amqp"));
1618
},
1719
*onInit(container) {
1820
let service = yield container.resolve("service");
@@ -28,4 +30,4 @@ module.exports = function () {
2830
service.addModule("sub-queue-rabbit", serviceSubQueueRabbit);
2931
}
3032
};
31-
};
33+
};

labs/amqplib-reconnect-test.js

Lines changed: 0 additions & 79 deletions
This file was deleted.

labs/rabbit-reconnect-test.js

Lines changed: 0 additions & 51 deletions
This file was deleted.

lib/Rabbit.js

Lines changed: 0 additions & 220 deletions
This file was deleted.
File renamed without changes.

lib/service_pub_queue_rabbit.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
const { Component, AsyncEmitter } = require("merapi");
44
const pack = require("../package");
55

6-
const Rabbit = require("./Rabbit");
7-
86
class ServicePubQueueRabbit extends Component.mixin(AsyncEmitter) {
97

10-
constructor(config, logger, injector, servicePubQueue) {
8+
constructor(config, logger, injector, amqp, servicePubQueue) {
119
super();
1210

1311
this.config = config;
@@ -97,4 +95,4 @@ class ServicePubQueueRabbit extends Component.mixin(AsyncEmitter) {
9795
*unmount() { }
9896
}
9997

100-
module.exports = ServicePubQueueRabbit;
98+
module.exports = ServicePubQueueRabbit;

0 commit comments

Comments
 (0)