server/args.go

@@ -26,9 +26,9 @@ type Args struct {
 	DBPath              string
 	Chain               *string
 	EsHost              string
-	EsPort              string
-	PrometheusPort      string
-	NotifierPort        string
+	EsPort              int
+	PrometheusPort      int
+	NotifierPort        int
 	JSONRPCPort         int
 	JSONRPCHTTPPort     int
 	MaxSessions         int
@@ -71,9 +71,9 @@ const (
 	DefaultDBPath          = "/mnt/d/data/snapshot_1072108/lbry-rocksdb/" // FIXME
 	DefaultEsHost          = "http://localhost"
 	DefaultEsIndex         = "claims"
-	DefaultEsPort          = "9200"
-	DefaultPrometheusPort  = "2112"
-	DefaultNotifierPort    = "18080"
+	DefaultEsPort          = 9200
+	DefaultPrometheusPort  = 2112
+	DefaultNotifierPort    = 18080
 	DefaultJSONRPCPort     = 50001
 	DefaultJSONRPCHTTPPort = 50002
 	DefaultMaxSessions     = 10000
@@ -219,9 +219,9 @@ func ParseArgs(searchRequest *pb.SearchRequest) *Args {
 	chain := parser.Selector("", "chain", []string{chaincfg.MainNetParams.Name, chaincfg.TestNet3Params.Name, chaincfg.RegressionNetParams.Name, "testnet"},
 		&argparse.Options{Required: false, Help: "Which chain to use, default is 'mainnet'. Values 'regtest' and 'testnet' are for testing", Default: chaincfg.MainNetParams.Name})
 	esHost := parser.String("", "eshost", &argparse.Options{Required: false, Help: "elasticsearch host", Default: DefaultEsHost})
-	esPort := parser.String("", "esport", &argparse.Options{Required: false, Help: "elasticsearch port", Default: DefaultEsPort})
-	prometheusPort := parser.String("", "prometheus-port", &argparse.Options{Required: false, Help: "prometheus port", Default: DefaultPrometheusPort})
-	notifierPort := parser.String("", "notifier-port", &argparse.Options{Required: false, Help: "notifier port", Default: DefaultNotifierPort})
+	esPort := parser.Int("", "esport", &argparse.Options{Required: false, Help: "elasticsearch port", Default: DefaultEsPort})
+	prometheusPort := parser.Int("", "prometheus-port", &argparse.Options{Required: false, Help: "prometheus port", Default: DefaultPrometheusPort})
+	notifierPort := parser.Int("", "notifier-port", &argparse.Options{Required: false, Help: "notifier port", Default: DefaultNotifierPort})
 	jsonRPCPort := parser.Int("", "json-rpc-port", &argparse.Options{Required: false, Help: "JSON RPC port", Validate: validatePort, Default: DefaultJSONRPCPort})
 	jsonRPCHTTPPort := parser.Int("", "json-rpc-http-port", &argparse.Options{Required: false, Help: "JSON RPC over HTTP port", Validate: validatePort, Default: DefaultJSONRPCHTTPPort})
 	maxSessions := parser.Int("", "max-sessions", &argparse.Options{Required: false, Help: "Maximum number of electrum clients that can be connected", Default: DefaultMaxSessions})
@@ -334,11 +334,17 @@ func ParseArgs(searchRequest *pb.SearchRequest) *Args {
 	}
 
 	if esPort, ok := environment["ELASTIC_PORT"]; ok {
-		args.EsPort = esPort
+		args.EsPort, err = strconv.Atoi(esPort)
+		if err != nil {
+			log.Fatal(err)
+		}
 	}
 
 	if prometheusPort, ok := environment["GOHUB_PROMETHEUS_PORT"]; ok {
-		args.PrometheusPort = prometheusPort
+		args.PrometheusPort, err = strconv.Atoi(prometheusPort)
+		if err != nil {
+			log.Fatal(err)
+		}
 	}
 
 	/*

server/federation_test.go

@@ -175,7 +175,7 @@ func TestAddPeerEndpoint(t *testing.T) {
 	args2 := server.MakeDefaultTestArgs()
 	args2.DisableStartNotifier = false
 	args2.Port = 50052
-	args2.NotifierPort = "18081"
+	args2.NotifierPort = 18081
 
 	tests := []struct {
 		name          string
@@ -255,8 +255,8 @@ func TestAddPeerEndpoint2(t *testing.T) {
 	args.DisableStartNotifier = false
 	args2.DisableStartNotifier = false
 	args3.DisableStartNotifier = false
-	args2.NotifierPort = "18081"
-	args3.NotifierPort = "18082"
+	args2.NotifierPort = 18081
+	args3.NotifierPort = 18082
 
 	tests := []struct {
 		name            string
@@ -345,8 +345,8 @@ func TestAddPeerEndpoint3(t *testing.T) {
 	args.DisableStartNotifier = false
 	args2.DisableStartNotifier = false
 	args3.DisableStartNotifier = false
-	args2.NotifierPort = "18081"
-	args3.NotifierPort = "18082"
+	args2.NotifierPort = 18081
+	args3.NotifierPort = 18082
 
 	tests := []struct {
 		name            string

server/notifier.go

@@ -2,6 +2,7 @@ package server
 
 import (
 	"encoding/binary"
+	"fmt"
 	"net"
 
 	"github.com/lbryio/herald.go/internal"
@@ -72,7 +73,7 @@ func (s *Server) RunNotifier() error {
 // NotifierServer implements the TCP protocol for height/blockheader notifications
 func (s *Server) NotifierServer() error {
 	s.Grp.Add(1)
-	address := ":" + s.Args.NotifierPort
+	address := ":" + fmt.Sprintf("%d", s.Args.NotifierPort)
 	addr, err := net.ResolveTCPAddr("tcp", address)
 	if err != nil {
 		return err

server/notifier_test.go

@@ -77,7 +77,7 @@ func TestNotifierServer(t *testing.T) {
 
 	// time.Sleep(time.Second * 2)
 
-	addr := fmt.Sprintf(":%s", args.NotifierPort)
+	addr := fmt.Sprintf(":%d", args.NotifierPort)
 	logrus.Info(addr)
 	conn, err := tcpConnReady(addr)
 	if err != nil {

server/server.go

@@ -256,7 +256,7 @@ func MakeHubServer(grp *stop.Group, args *Args) *Server {
 
 	var client *elastic.Client = nil
 	if !args.DisableEs {
-		esUrl := args.EsHost + ":" + args.EsPort
+		esUrl := args.EsHost + ":" + fmt.Sprintf("%d", args.EsPort)
 		opts := []elastic.ClientOptionFunc{
 			elastic.SetSniff(true),
 			elastic.SetSnifferTimeoutStartup(time.Second * 60),
@@ -376,7 +376,7 @@ func MakeHubServer(grp *stop.Group, args *Args) *Server {
 		myDB.RunGetBlocksAndFilters()
 	}
 	if !args.DisableStartPrometheus {
-		go s.prometheusEndpoint(s.Args.PrometheusPort, "metrics")
+		go s.prometheusEndpoint(fmt.Sprintf("%d", s.Args.PrometheusPort), "metrics")
 	}
 	if !args.DisableStartUDP {
 		go func() {