From db78252019d8d16de80f6c923e251b3028805d83 Mon Sep 17 00:00:00 2001 From: Frank Schroeder Date: Thu, 15 Jun 2017 18:45:30 +0200 Subject: [PATCH] agent: move NotifyGroup into the agent pkg --- agent/agent.go | 3 +-- agent/{consul/state => }/notify.go | 2 +- agent/{consul/state => }/notify_test.go | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) rename agent/{consul/state => }/notify.go (98%) rename agent/{consul/state => }/notify_test.go (98%) diff --git a/agent/agent.go b/agent/agent.go index e1f743c99..2b2f85487 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -22,7 +22,6 @@ import ( "time" "github.com/hashicorp/consul/agent/consul" - "github.com/hashicorp/consul/agent/consul/state" "github.com/hashicorp/consul/agent/consul/structs" "github.com/hashicorp/consul/api" "github.com/hashicorp/consul/ipaddr" @@ -135,7 +134,7 @@ type Agent struct { eventBuf []*UserEvent eventIndex int eventLock sync.RWMutex - eventNotify state.NotifyGroup + eventNotify NotifyGroup reloadCh chan chan error diff --git a/agent/consul/state/notify.go b/agent/notify.go similarity index 98% rename from agent/consul/state/notify.go rename to agent/notify.go index c215987e9..3a2a160fa 100644 --- a/agent/consul/state/notify.go +++ b/agent/notify.go @@ -1,4 +1,4 @@ -package state +package agent import ( "sync" diff --git a/agent/consul/state/notify_test.go b/agent/notify_test.go similarity index 98% rename from agent/consul/state/notify_test.go rename to agent/notify_test.go index 34c14f46d..d95bbb2ba 100644 --- a/agent/consul/state/notify_test.go +++ b/agent/notify_test.go @@ -1,4 +1,4 @@ -package state +package agent import ( "testing"