From 3e324a0855048640dc848584b53c5b073d46eb10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20D=C3=ADaz?= <g.diaz.lopezllave@bbva.com>
Date: Thu, 22 Nov 2018 18:35:09 +0100
Subject: [PATCH] Update start code with new agent

---
 cmd/agent_start.go | 21 +++++++++++----------
 server/server.go   |  5 +++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/cmd/agent_start.go b/cmd/agent_start.go
index 56d06d1c2..13689e77b 100644
--- a/cmd/agent_start.go
+++ b/cmd/agent_start.go
@@ -22,8 +22,7 @@ import (
 	"syscall"
 
 	"github.com/bbva/qed/gossip"
-	"github.com/bbva/qed/gossip/auditor"
-	"github.com/bbva/qed/gossip/monitor"
+	"github.com/bbva/qed/gossip/member"
 	"github.com/bbva/qed/log"
 	"github.com/spf13/cobra"
 )
@@ -44,19 +43,20 @@ func newAgentStartCommand() *cobra.Command {
 			config.NodeName = nodeName
 			config.BindAddr = bindAddr
 			config.AdvertiseAddr = advertiseAddr
-			config.Role = gossip.NewNodeType(role)
+			config.Role = member.ParseType(role)
 			config.EnableCompression = true
 
 			var agent *gossip.Agent
 			var err error
+
 			switch config.Role {
-			case gossip.PublisherType:
-			case gossip.MonitorType:
-				conf := monitor.DefaultConfig()
-				agent, err = gossip.Create(config, monitor.NewMonitorHandlerBuilder(conf))
-			case gossip.AuditorType:
-				conf := auditor.DefaultConfig()
-				agent, err = gossip.Create(config, auditor.NewAuditorHandlerBuilder(conf))
+			case member.Publisher:
+			case member.Monitor:
+				// conf := monitor.DefaultConfig()
+				agent, err = gossip.NewAgent(config, []gossip.Processor{gossip.DummyProcessor{}})
+			case member.Auditor:
+				// conf := auditor.DefaultConfig()
+				agent, err = gossip.NewAgent(config, []gossip.Processor{gossip.DummyProcessor{}})
 			default:
 				log.Fatalf("Failed to start the QED agent: unknown role")
 			}
@@ -70,6 +70,7 @@ func newAgentStartCommand() *cobra.Command {
 			}
 			log.Debugf("Number of nodes contacted: %d", contacted)
 
+			agent.Start()
 			defer agent.Shutdown()
 			awaitTermSignal(agent.Leave)
 
diff --git a/server/server.go b/server/server.go
index 9b9e633c7..cd2ff75f8 100644
--- a/server/server.go
+++ b/server/server.go
@@ -33,6 +33,7 @@ import (
 	"github.com/bbva/qed/api/mgmthttp"
 	"github.com/bbva/qed/api/tampering"
 	"github.com/bbva/qed/gossip"
+	"github.com/bbva/qed/gossip/member"
 	"github.com/bbva/qed/gossip/sender"
 	"github.com/bbva/qed/hashing"
 	"github.com/bbva/qed/log"
@@ -137,8 +138,8 @@ func NewServer(
 	// Create gossip agent
 	config := gossip.DefaultConfig()
 	config.BindAddr = gossipAddr
-	config.Role = gossip.ServerType
-	server.agent, err = gossip.Create(config, gossip.NewNopMessageHandler)
+	config.Role = member.Server
+	server.agent, err = gossip.NewAgent(config, nil)
 	if err != nil {
 		return nil, err
 	}