new logger and etcd fixes

pkg/raft/cluster.go

@@ -9,9 +9,9 @@ import (
 )
 
 type Cluster struct {
-	logr.Logger
 	cluster.KV
-	r *raft.Raft
+	log logr.Logger
+	r   *raft.Raft
 
 	kvm       *kv
 	stepdown  chan struct{}
@@ -24,17 +24,25 @@ type Cluster struct {
 }
 
 func NewCluster(log logr.Logger) cluster.Cluster {
+	c := &Cluster{log: log}
+	c.Reset()
+	return c
+}
+
+func (c *Cluster) Reset() {
 	kvm := &kv{
 		m: make(map[string][]byte),
 	}
-	return &Cluster{
-		Logger:   log,
-		KV:       kvm,
-		kvm:      kvm,
-		stepdown: make(chan struct{}, 1),
-		stop:     make(chan struct{}, 1),
-		done:     make(chan struct{}, 1),
-	}
+	c.KV = kvm
+	c.kvm = kvm
+	c.stepdown = make(chan struct{}, 1)
+	c.stop = make(chan struct{}, 1)
+	c.done = make(chan struct{}, 1)
+	c.fatal = nil
+}
+
+func (c *Cluster) Logger() logr.Logger {
+	return c.log
 }
 
 func (c *Cluster) ID() string {