Browse Source

raftexample: fixes from go vet, go lint

Gyu-Ho Lee 9 years ago
parent
commit
c1e3601776
2 changed files with 5 additions and 5 deletions
  1. 3 3
      contrib/raftexample/kvstore.go
  2. 2 2
      contrib/raftexample/listener.go

+ 3 - 3
contrib/raftexample/kvstore.go

@@ -64,13 +64,13 @@ func (s *kvstore) readCommits(commitC <-chan *string, errorC <-chan error) {
 			return
 			return
 		}
 		}
 
 
-		var data_kv kv
+		var dataKv kv
 		dec := gob.NewDecoder(bytes.NewBufferString(*data))
 		dec := gob.NewDecoder(bytes.NewBufferString(*data))
-		if err := dec.Decode(&data_kv); err != nil {
+		if err := dec.Decode(&dataKv); err != nil {
 			log.Fatalf("raftexample: could not decode message (%v)", err)
 			log.Fatalf("raftexample: could not decode message (%v)", err)
 		}
 		}
 		s.mu.Lock()
 		s.mu.Lock()
-		s.kvStore[data_kv.Key] = data_kv.Val
+		s.kvStore[dataKv.Key] = dataKv.Val
 		s.mu.Unlock()
 		s.mu.Unlock()
 	}
 	}
 	if err, ok := <-errorC; ok {
 	if err, ok := <-errorC; ok {

+ 2 - 2
contrib/raftexample/listener.go

@@ -42,9 +42,9 @@ func (ln stoppableListener) Accept() (c net.Conn, err error) {
 		tc, err := ln.AcceptTCP()
 		tc, err := ln.AcceptTCP()
 		if err != nil {
 		if err != nil {
 			errc <- err
 			errc <- err
-		} else {
-			connc <- tc
+			return
 		}
 		}
+		connc <- tc
 	}()
 	}()
 	select {
 	select {
 	case <-ln.stopc:
 	case <-ln.stopc: