Merge remote-tracking branch 'origin/master' into feature/jobs_plugin

# Conflicts:
#	plugins/websockets/plugin.go

1 files changed, 25 insertions, 0 deletions

diff --git a/plugins/broadcast/config.go b/plugins/broadcast/config.go
new file mode 100644
index 00000000..4f1e5213
--- /dev/null
+++ b/plugins/broadcast/config.go
@@ -0,0 +1,25 @@
+package broadcast
+
+/*
+
+# Global redis config (priority - 2)
+
+websockets: # <----- one of possible subscribers
+  path: /ws
+  broker: default # <------ broadcast broker to use --------------- |
+                                                                    |  match
+broadcast: # <-------- broadcast entry point plugin                 |
+  default: # <----------------------------------------------------- |
+     driver: redis
+     # local redis config (priority - 1)
+  test:
+     driver: memory
+
+
+priority local -> global
+*/
+
+// Config ...
+type Config struct {
+	Data map[string]interface{} `mapstructure:"broadcast"`
+}