bfgd, electrumx: make initial and max conns configurable (#206)

cmd/bfgd/bfgd.go

@@ -37,6 +37,18 @@ var (
 			Help:         "electrumx endpoint",
 			Print:        config.PrintAll,
 		},
+		"BFG_EXBTC_INITIAL_CONNECTIONS": config.Config{
+			Value:        &cfg.EXBTCInitialConns,
+			DefaultValue: 5,
+			Help:         "electrumx initial connections",
+			Print:        config.PrintAll,
+		},
+		"BFG_EXBTC_MAX_CONNECTIONS": config.Config{
+			Value:        &cfg.EXBTCMaxConns,
+			DefaultValue: 100,
+			Help:         "electrumx max connections",
+			Print:        config.PrintAll,
+		},
 		"BFG_PUBLIC_KEY_AUTH": config.Config{
 			Value:        &cfg.PublicKeyAuth,
 			DefaultValue: false,

cmd/extool/extool.go

@@ -37,7 +37,7 @@ func main() {
 		log.Fatal("No address specified")
 	}
 
-	c, err := electrumx.NewClient(address)
+	c, err := electrumx.NewClient(address, 1, 1)
 	if err != nil {
 		log.Fatalf("Failed to create electrumx client: %v", err)
 	}

docker/bfgd/Dockerfile

@@ -55,15 +55,19 @@ COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo
 COPY --from=builder /build/bin/bfgd /usr/local/bin/bfgd
 
 # Environment variables
-ENV BFG_EXBTC_ADDRESS=
-ENV BFG_PUBLIC_KEY_AUTH=
-ENV BFG_BTC_START_HEIGHT=
-ENV BFG_LOG_LEVEL=
-ENV BFG_POSTGRES_URI=
-ENV BFG_PUBLIC_ADDRESS=
-ENV BFG_PRIVATE_ADDRESS=
-ENV BFG_PROMETHEUS_ADDRESS=
-ENV BFG_PPROF_ADDRESS=
+ENV BFG_EXBTC_ADDRESS=""
+ENV BFG_EXBTC_INITIAL_CONNECTIONS=""
+ENV BFG_EXBTC_MAX_CONNECTIONS=""
+ENV BFG_PUBLIC_KEY_AUTH=""
+ENV BFG_BTC_START_HEIGHT=""
+ENV BFG_LOG_LEVEL=""
+ENV BFG_POSTGRES_URI=""
+ENV BFG_PUBLIC_ADDRESS=""
+ENV BFG_PRIVATE_ADDRESS=""
+ENV BFG_PROMETHEUS_ADDRESS=""
+ENV BFG_PPROF_ADDRESS=""
+ENV BFG_REQUEST_LIMIT=""
+ENV BFG_REQUEST_TIMEOUT=""
 
 USER bfgd:bfgd
 WORKDIR /etc/bfgd/

hemi/electrumx/conn_pool_test.go

@@ -10,6 +10,11 @@ import (
 	"time"
 )
 
+const (
+	clientInitialConnections = 2
+	clientMaximumConnections = 5
+)
+
 func TestConnPool(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()

hemi/electrumx/electrumx.go

@@ -124,19 +124,13 @@ type Client struct {
 
 var log = loggo.GetLogger("electrumx")
 
-const (
-	clientInitialConnections = 2
-	clientMaximumConnections = 5
-)
-
 // NewClient returns an initialised electrumx client.
-func NewClient(address string) (*Client, error) {
+func NewClient(address string, initialConns, maxConns int) (*Client, error) {
 	c := &Client{}
 
 	// The address may be empty during tests, ignore empty addresses.
 	if address != "" {
-		pool, err := newConnPool("tcp", address,
-			clientInitialConnections, clientMaximumConnections)
+		pool, err := newConnPool("tcp", address, initialConns, maxConns)
 		if err != nil {
 			return nil, fmt.Errorf("new connection pool: %w", err)
 		}

service/bfg/bfg.go

@@ -63,6 +63,8 @@ func init() {
 func NewDefaultConfig() *Config {
 	return &Config{
 		EXBTCAddress:         "localhost:18001",
+		EXBTCInitialConns:    5,
+		EXBTCMaxConns:        100,
 		PrivateListenAddress: ":8080",
 		PublicListenAddress:  ":8383",
 		RequestLimit:         bfgapi.DefaultRequestLimit,
@@ -86,6 +88,8 @@ type btcClient interface {
 type Config struct {
 	BTCStartHeight          uint64
 	EXBTCAddress            string
+	EXBTCInitialConns       int
+	EXBTCMaxConns           int
 	PrivateListenAddress    string
 	PublicListenAddress     string
 	LogLevel                string
@@ -213,7 +217,7 @@ func NewServer(cfg *Config) (*Server, error) {
 	}
 
 	var err error
-	s.btcClient, err = electrumx.NewClient(cfg.EXBTCAddress)
+	s.btcClient, err = electrumx.NewClient(cfg.EXBTCAddress, cfg.EXBTCInitialConns, cfg.EXBTCMaxConns)
 	if err != nil {
 		return nil, fmt.Errorf("create electrumx client: %w", err)
 	}