Skip to content
This repository has been archived by the owner on Mar 10, 2020. It is now read-only.

ZMQ -> ZeroMQ #190

Merged
merged 9 commits into from
Aug 6, 2018
Merged

ZMQ -> ZeroMQ #190

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a69eb26
ZMQ -> ZeroMQ
shadyvd Jul 29, 2018
fbdcea4
Updated kafka-node dependency, added node 8+ dependency for build tes…
shadyvd Jul 29, 2018
943b43c
Revert "Updated kafka-node dependency, added node 8+ dependency for b…
shadyvd Jul 29, 2018
a734e84
Added node.js v8 and node.js v10 to the testing mix
shadyvd Aug 2, 2018
12d8083
Minor fix
shadyvd Aug 2, 2018
4ea37ba
package.json changes
shadyvd Aug 2, 2018
76157ec
Try the (old) zmq module before trying the zeromq module - prevents t…
shadyvd Aug 2, 2018
46e5a71
Reverting node-kafka to ~0.5.8
shadyvd Aug 2, 2018
c34d37c
Re-include zmq in package.json - use it on node.js < V8, but upgrade …
shadyvd Aug 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ var ascoltatori = require('ascoltatori');
var settings = {
type: 'zmq',
json: false,
zmq: require("zmq"),
zmq: require("zeromq"),
port: "tcp://127.0.0.1:33333",
controlPort: "tcp://127.0.0.1:33334",
delay: 10
Expand Down
2 changes: 1 addition & 1 deletion lib/zeromq_ascoltatore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function ZeromqAscoltatore(opts) {

this._opts = opts || {};
this._opts.delay = this._opts.delay || 5;
this._opts.zmq = this._opts.zmq || require("zmq");
this._opts.zmq = this._opts.zmq || require("zeromq");

this._connectedControls = [];

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"optionalDependencies": {
"ioredis": "^2.3.0",
"msgpack-lite": "^0.1.20",
"zmq": "^2.14.0",
"zeromq": "*",
"amqp": "~0.2.4",
"amqplib": "~0.5.1",
"mqtt": "^2.3.0",
Expand Down
2 changes: 1 addition & 1 deletion test/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ global.nextPort = function() {
global.zeromqSettings = function(remote_ports) {
return {
json: false,
zmq: require("zmq"),
zmq: require("zeromq"),
port: "tcp://127.0.0.1:" + global.nextPort(),
controlPort: "tcp://127.0.0.1:" + global.nextPort(),
delay: 10
Expand Down