Merge pull request #5 from IoTMOD/fix/zmq

Add configurable ZMQ protocols and host
iotaledger · Dec 12, 2019 · 1558d39 · 1558d39
2 parents bf47b92 + 58133b6
commit 1558d39
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/plugins/zeromq/parameters.go b/plugins/zeromq/parameters.go
@@ -3,5 +3,7 @@ package zeromq
 import flag "github.com/spf13/pflag"
 
 func init() {
-	flag.Int("zmq.port", 5556, "tcp port used to connect to the zmq feed")
+	flag.String("zmq.protocol", "tcp", "protocol used to connect to the zmq feed [unix, tcp, udp, inproc]")
+	flag.String("zmq.host", "0.0.0.0", "host used to connect to the zmq feed")
+	flag.Int("zmq.port", 5556, "port used to connect to the zmq feed")
 }
diff --git a/plugins/zeromq/plugin.go b/plugins/zeromq/plugin.go
@@ -3,9 +3,6 @@ package zeromq
 import (
 	"time"
 
-	daemon "github.com/iotaledger/hive.go/daemon/ordered"
-	"github.com/iotaledger/hive.go/events"
-	"github.com/iotaledger/hive.go/parameter"
 	"github.com/gohornet/hornet/packages/logger"
 	"github.com/gohornet/hornet/packages/model/hornet"
 	"github.com/gohornet/hornet/packages/model/milestone_index"
@@ -15,6 +12,9 @@ import (
 	"github.com/gohornet/hornet/packages/timeutil"
 	"github.com/gohornet/hornet/packages/workerpool"
 	"github.com/gohornet/hornet/plugins/tangle"
+	daemon "github.com/iotaledger/hive.go/daemon/ordered"
+	"github.com/iotaledger/hive.go/events"
+	"github.com/iotaledger/hive.go/parameter"
 )
 
 const (
@@ -180,5 +180,5 @@ func startPublisher() error {
 	}
 	publisher = pub
 
-	return publisher.Start(parameter.NodeConfig.GetInt("zmq.port"))
+	return publisher.Start()
 }
diff --git a/plugins/zeromq/publisher.go b/plugins/zeromq/publisher.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	zmq "github.com/go-zeromq/zmq4"
+	"github.com/iotaledger/hive.go/parameter"
 )
 
 // Publisher is a simple zmq publisher abstraction
@@ -24,8 +25,9 @@ func NewPublisher() (*Publisher, error) {
 }
 
 // Start the publisher on the given port.
-func (pub *Publisher) Start(port int) error {
-	return pub.socket.Listen("tcp://*:" + strconv.Itoa(port))
+func (pub *Publisher) Start() error {
+	endpoint := parameter.NodeConfig.GetString("zmq.protocol") + "://" + parameter.NodeConfig.GetString("zmq.host") + ":" + strconv.Itoa(parameter.NodeConfig.GetInt("zmq.port"))
+	return pub.socket.Listen(endpoint)
 }
 
 // Shutdown stops the publisher.