luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Revert "ae: fix typo in constructor name" 

This reverts commit e88f49e2ccc79f77b5395de28d8fbdfc6eeb36f6.
This commit is contained in:
Frank Schroeder 2017-10-23 10:08:32 +02:00
parent 4bdf161d5c
commit 7a92839663
No known key found for this signature in database
GPG Key ID: 4D65C6EAEC87DECD
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/ae/ae.go
View File

@ -99,7 +99,7 @@ const (
retryFailIntv = 15 * time.Second
)
func NewStateSyncer(state State, intv time.Duration, shutdownCh chan struct{}, logger *log.Logger) *StateSyncer {
func NewStateSyner(state State, intv time.Duration, shutdownCh chan struct{}, logger *log.Logger) *StateSyncer {
s := &StateSyncer{
State: state,
Interval: intv,

6
agent/ae/ae_test.go
View File

@ -29,7 +29,7 @@ func TestAE_scaleFactor(t *testing.T) {
func TestAE_Pause_nestedPauseResume(t *testing.T) {
t.Parallel()
l := NewStateSyncer(nil, 0, nil, nil)
l := NewStateSyner(nil, 0, nil, nil)
if l.Paused() != false {
t.Fatal("syncer should be unPaused after init")
}
@ -60,7 +60,7 @@ func TestAE_Pause_nestedPauseResume(t *testing.T) {
}
func TestAE_Pause_ResumeTriggersSyncChanges(t *testing.T) {
l := NewStateSyncer(nil, 0, nil, nil)
l := NewStateSyner(nil, 0, nil, nil)
l.Pause()
l.Resume()
select {
@ -74,7 +74,7 @@ func TestAE_Pause_ResumeTriggersSyncChanges(t *testing.T) {
}
func TestAE_Pause_ifNotPausedRun(t *testing.T) {
l := NewStateSyncer(nil, 0, nil, nil)
l := NewStateSyner(nil, 0, nil, nil)
errCalled := errors.New("f called")
f := func() error { return errCalled }

2
agent/agent.go
View File

@ -268,7 +268,7 @@ func (a *Agent) Start() error {
// create the state synchronization manager which performs
// regular and on-demand state synchronizations (anti-entropy).
a.sync = ae.NewStateSyncer(a.State, c.AEInterval, a.shutdownCh, a.logger)
a.sync = ae.NewStateSyner(a.State, c.AEInterval, a.shutdownCh, a.logger)
// create the config for the rpc server/client
consulCfg, err := a.consulConfig()