Browse Source

Add grpcSettings (alias of gunSettings)

RPRX 4 years ago
parent
commit
3b7ed982fb
2 changed files with 5 additions and 3 deletions
  1. 4 0
      infra/conf/transport.go
  2. 1 3
      infra/conf/transport_internet.go

+ 4 - 0
infra/conf/transport.go

@@ -14,6 +14,7 @@ type TransportConfig struct {
 	DSConfig   *DomainSocketConfig `json:"dsSettings"`
 	QUICConfig *QUICConfig         `json:"quicSettings"`
 	GunConfig  *GunConfig          `json:"gunSettings"`
+	GRPCConfig *GunConfig          `json:"grpcSettings"`
 }
 
 // Build implements Buildable.
@@ -86,6 +87,9 @@ func (c *TransportConfig) Build() (*transport.Config, error) {
 		})
 	}
 
+	if c.GunConfig == nil {
+		c.GunConfig = c.GRPCConfig
+	}
 	if c.GunConfig != nil {
 		gs, err := c.GunConfig.Build()
 		if err != nil {

+ 1 - 3
infra/conf/transport_internet.go

@@ -336,9 +336,7 @@ func (p TransportProtocol) Build() (string, error) {
 		return "domainsocket", nil
 	case "quic":
 		return "quic", nil
-	case "gun":
-		return "gun", nil
-	case "grpc": // gun alias
+	case "gun", "grpc":
 		return "gun", nil
 	default:
 		return "", newError("Config: unknown transport protocol: ", p)