From e7f0b617ec2c4e0b8f87925c359fff8ad1687bc4 Mon Sep 17 00:00:00 2001
From: Radu Ioan Fericean <radu@fericean.ro>
Date: Wed, 1 Jul 2015 20:34:32 +0300
Subject: [PATCH] first successful live test

---
 cmd/cgr-engine/cgr-engine.go             |  2 +-
 config/config_json.go                    |  4 ++--
 data/conf/samples/cgradmin/cgradmin.json | 11 +++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go
index e5b9fae17..c46775254 100644
--- a/cmd/cgr-engine/cgr-engine.go
+++ b/cmd/cgr-engine/cgr-engine.go
@@ -371,7 +371,7 @@ func startPubSubServer(chanDone chan struct{}) {
 		exitChan <- true
 		return
 	}
-	server.RpcRegisterName("PubSub", pubSubServer)
+	server.RpcRegisterName("PubSubV1", pubSubServer)
 	close(chanDone)
 }
 
diff --git a/config/config_json.go b/config/config_json.go
index 7ef0ca3bd..213ff65c2 100644
--- a/config/config_json.go
+++ b/config/config_json.go
@@ -258,7 +258,7 @@ func (self CgrJsonCfg) HistAgentJsonCfg() (*HistAgentJsonCfg, error) {
 }
 
 func (self CgrJsonCfg) PubSubServJsonCfg() (*PubSubServJsonCfg, error) {
-	rawCfg, hasKey := self[HISTSERV_JSN]
+	rawCfg, hasKey := self[PUBSUBSERV_JSN]
 	if !hasKey {
 		return nil, nil
 	}
@@ -270,7 +270,7 @@ func (self CgrJsonCfg) PubSubServJsonCfg() (*PubSubServJsonCfg, error) {
 }
 
 func (self CgrJsonCfg) PubSubAgentJsonCfg() (*PubSubAgentJsonCfg, error) {
-	rawCfg, hasKey := self[HISTAGENT_JSN]
+	rawCfg, hasKey := self[PUBSUBAGENT_JSN]
 	if !hasKey {
 		return nil, nil
 	}
diff --git a/data/conf/samples/cgradmin/cgradmin.json b/data/conf/samples/cgradmin/cgradmin.json
index 46f6fae5d..f8fcb0475 100644
--- a/data/conf/samples/cgradmin/cgradmin.json
+++ b/data/conf/samples/cgradmin/cgradmin.json
@@ -17,4 +17,15 @@
 "scheduler": {
 	"enabled": true,						// start Scheduler service: <true|false>
 },
+
+"pubsub_server": {
+	"enabled": true,							// starts pubsub service: <true|false>.
+	"save_interval": "1m",						// interval to save subscribers
+},
+
+
+"pubsub_agent": {
+	"enabled": true,			// starts pubsub as a client: <true|false>.
+	"server": "internal",		// address where to reach the master pubsub server: <internal|x.y.z.y:1234>
+},
 }