From a16635b65c06a94a800af0215ae5d80ef38811e2 Mon Sep 17 00:00:00 2001 From: kompotkot Date: Mon, 24 Jan 2022 17:20:35 +0000 Subject: [PATCH] Hardcoded eth and pol default ports --- nodes/node_balancer/cmd/middleware.go | 2 +- nodes/node_balancer/configs/settings.go | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/nodes/node_balancer/cmd/middleware.go b/nodes/node_balancer/cmd/middleware.go index 1bc69fda..c2bb6350 100644 --- a/nodes/node_balancer/cmd/middleware.go +++ b/nodes/node_balancer/cmd/middleware.go @@ -36,7 +36,7 @@ func logMiddleware(next http.Handler) http.Handler { if err != nil { log.Printf("Unable to parse client IP: %s\n", r.RemoteAddr) } else { - log.Printf("%s %s %s\n", ip, r.Method, r.URL.Path) + log.Printf("%s %s %s %s\n", ip, r.Method, r.URL.Path, r.Header.Get("X-Origin-Path")) } }) } diff --git a/nodes/node_balancer/configs/settings.go b/nodes/node_balancer/configs/settings.go index 5eb88113..733ffb40 100644 --- a/nodes/node_balancer/configs/settings.go +++ b/nodes/node_balancer/configs/settings.go @@ -30,10 +30,8 @@ var ConfigList NodeConfigList var MOONSTREAM_NODE_ETHEREUM_A_IPC_ADDR = os.Getenv("MOONSTREAM_NODE_ETHEREUM_A_IPC_ADDR") var MOONSTREAM_NODE_ETHEREUM_B_IPC_ADDR = os.Getenv("MOONSTREAM_NODE_ETHEREUM_B_IPC_ADDR") -var MOONSTREAM_NODE_ETHEREUM_IPC_PORT = os.Getenv("MOONSTREAM_NODE_ETHEREUM_IPC_PORT") var MOONSTREAM_NODE_POLYGON_A_IPC_ADDR = os.Getenv("MOONSTREAM_NODE_POLYGON_A_IPC_ADDR") var MOONSTREAM_NODE_POLYGON_B_IPC_ADDR = os.Getenv("MOONSTREAM_NODE_POLYGON_B_IPC_ADDR") -var MOONSTREAM_NODE_POLYGON_IPC_PORT = os.Getenv("MOONSTREAM_NODE_POLYGON_IPC_PORT") var MOONSTREAM_NODES_SERVER_PORT = os.Getenv("MOONSTREAM_NODES_SERVER_PORT") var MOONSTREAM_CLIENT_ID_HEADER = os.Getenv("MOONSTREAM_CLIENT_ID_HEADER") @@ -56,8 +54,8 @@ func checkEnvVarSet() { MOONSTREAM_CLIENT_ID_HEADER = "x-moonstream-client-id" } - if MOONSTREAM_NODES_SERVER_PORT == "" || MOONSTREAM_NODE_ETHEREUM_IPC_PORT == "" || MOONSTREAM_NODE_POLYGON_IPC_PORT == "" { - log.Fatal("Some of environment variables not set") + if MOONSTREAM_NODES_SERVER_PORT == "" { + log.Fatal("Environment variable MOONSTREAM_NODES_SERVER_PORT should be set") } } @@ -70,12 +68,12 @@ func (nc *NodeConfigList) InitNodeConfigList() { blockchainConfigList = append(blockchainConfigList, BlockchainConfig{ Blockchain: "ethereum", IPs: []string{MOONSTREAM_NODE_ETHEREUM_A_IPC_ADDR, MOONSTREAM_NODE_ETHEREUM_B_IPC_ADDR}, - Port: MOONSTREAM_NODE_ETHEREUM_IPC_PORT, + Port: "8545", }) blockchainConfigList = append(blockchainConfigList, BlockchainConfig{ Blockchain: "polygon", IPs: []string{MOONSTREAM_NODE_POLYGON_A_IPC_ADDR, MOONSTREAM_NODE_POLYGON_B_IPC_ADDR}, - Port: MOONSTREAM_NODE_POLYGON_IPC_PORT, + Port: "8545", }) // Parse node addr, ip and blockchain