Merge pull request #360 from streamdal/blinktag/relay_update_defaults

Apply default gRPC settings to a relay if none specified
streamdal · Jul 12, 2023 · f15555b · f15555b
2 parents a51e9cd + 01e24d3
commit f15555b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/actions/relay.go b/actions/relay.go
@@ -157,6 +157,8 @@ func (a *Actions) UpdateRelay(ctx context.Context, relayID string, relayOpts *op
 	}
 
 	if relay.Active {
+		a.log.Debugf("relay '%s' is active, stopping relay", relayID)
+
 		// Close existing relay
 		relay.CancelFunc()
 		relay.Active = false

diff --git a/relay/relay.go b/relay/relay.go
@@ -33,6 +33,7 @@ import (
 	rpubsubTypes "github.com/batchcorp/plumber/backends/rpubsub/types"
 	rstreamsTypes "github.com/batchcorp/plumber/backends/rstreams/types"
 	"github.com/batchcorp/plumber/prometheus"
+	"github.com/batchcorp/plumber/validate"
 )
 
 const (
@@ -122,7 +123,11 @@ func validateConfig(cfg *Config) error {
 	}
 
 	if cfg.GRPCAddress == "" {
-		return ErrMissingGRPCAddress
+		cfg.GRPCAddress = validate.GRPCCollectorAddress
+	}
+
+	if cfg.Timeout == 0 {
+		cfg.Timeout = validate.GRPCDefaultTimeoutSeconds * time.Second
 	}
 
 	if cfg.RelayCh == nil {