- Initial broadcast commit

Signed-off-by: Valery Piashchynski <[email protected]>

1 files changed, 4 insertions, 55 deletions

diff --git a/plugins/websockets/config.go b/plugins/websockets/config.go
index deb4406c..b1d5d0a8 100644
--- a/plugins/websockets/config.go
+++ b/plugins/websockets/config.go
@@ -8,55 +8,16 @@ import (
 )
 
 /*
-# GLOBAL
-redis:
-  addrs:
-    - 'localhost:6379'
-
 websockets:
-  # pubsubs should implement PubSub interface to be collected via endure.Collects
-
-  pubsubs:["redis", "amqp", "memory"]
-  # OR local
-  redis:
-    addrs:
-      - 'localhost:6379'
-
-  # path used as websockets path
+  broker: default
+  allowed_origin: "*"
   path: "/ws"
 */
 
-type RedisConfig struct {
-	Addrs            []string      `mapstructure:"addrs"`
-	DB               int           `mapstructure:"db"`
-	Username         string        `mapstructure:"username"`
-	Password         string        `mapstructure:"password"`
-	MasterName       string        `mapstructure:"master_name"`
-	SentinelPassword string        `mapstructure:"sentinel_password"`
-	RouteByLatency   bool          `mapstructure:"route_by_latency"`
-	RouteRandomly    bool          `mapstructure:"route_randomly"`
-	MaxRetries       int           `mapstructure:"max_retries"`
-	DialTimeout      time.Duration `mapstructure:"dial_timeout"`
-	MinRetryBackoff  time.Duration `mapstructure:"min_retry_backoff"`
-	MaxRetryBackoff  time.Duration `mapstructure:"max_retry_backoff"`
-	PoolSize         int           `mapstructure:"pool_size"`
-	MinIdleConns     int           `mapstructure:"min_idle_conns"`
-	MaxConnAge       time.Duration `mapstructure:"max_conn_age"`
-	ReadTimeout      time.Duration `mapstructure:"read_timeout"`
-	WriteTimeout     time.Duration `mapstructure:"write_timeout"`
-	PoolTimeout      time.Duration `mapstructure:"pool_timeout"`
-	IdleTimeout      time.Duration `mapstructure:"idle_timeout"`
-	IdleCheckFreq    time.Duration `mapstructure:"idle_check_freq"`
-	ReadOnly         bool          `mapstructure:"read_only"`
-}
-
 // Config represents configuration for the ws plugin
 type Config struct {
 	// http path for the websocket
 	Path string `mapstructure:"path"`
-	// ["redis", "amqp", "memory"]
-	PubSubs    []string `mapstructure:"pubsubs"`
-	Middleware []string `mapstructure:"middleware"`
 
 	AllowedOrigin string `mapstructure:"allowed_origin"`
 
@@ -65,8 +26,8 @@ type Config struct {
 	allowedOrigins  []string
 	allowedAll      bool
 
-	Redis *RedisConfig `mapstructure:"redis"`
-	Pool  *pool.Config `mapstructure:"pool"`
+	// Pool with the workers for the websockets
+	Pool *pool.Config `mapstructure:"pool"`
 }
 
 // InitDefault initialize default values for the ws config
@@ -75,11 +36,6 @@ func (c *Config) InitDefault() {
 		c.Path = "/ws"
 	}
 
-	if len(c.PubSubs) == 0 {
-		// memory used by default
-		c.PubSubs = append(c.PubSubs, "memory")
-	}
-
 	if c.Pool == nil {
 		c.Pool = &pool.Config{}
 		if c.Pool.NumWorkers == 0 {
@@ -99,13 +55,6 @@ func (c *Config) InitDefault() {
 		}
 	}
 
-	if c.Redis != nil {
-		if c.Redis.Addrs == nil {
-			// append default
-			c.Redis.Addrs = append(c.Redis.Addrs, "localhost:6379")
-		}
-	}
-
 	if c.AllowedOrigin == "" {
 		c.AllowedOrigin = "*"
 	}