Merge pull request #663 from tsenart/master

Making code formatting consistent.

log/log.go

@@ -1,8 +1,9 @@
 package log
 
 import (
-	golog "github.com/coreos/etcd/third_party/github.com/coreos/go-log/log"
 	"os"
+
+	golog "github.com/coreos/etcd/third_party/github.com/coreos/go-log/log"
 )
 
 // The Verbose flag turns on verbose logging.

metrics/standard.go

@@ -12,19 +12,19 @@ import (
 const (
 	// RuntimeMemStatsSampleInterval is the interval in seconds at which the
 	// Go runtime's memory statistics will be gathered.
-	RuntimeMemStatsSampleInterval	= time.Duration(2) * time.Second
+	RuntimeMemStatsSampleInterval = time.Duration(2) * time.Second
 
 	// GraphitePublishInterval is the interval in seconds at which all
 	// gathered statistics will be published to a Graphite endpoint.
-	GraphitePublishInterval	= time.Duration(2) * time.Second
+	GraphitePublishInterval = time.Duration(2) * time.Second
 )
 
 type standardBucket struct {
 	sync.Mutex
-	name		string
+	name     string
-	registry	gometrics.Registry
+	registry gometrics.Registry
-	timers		map[string]Timer
+	timers   map[string]Timer
-	gauges		map[string]Gauge
+	gauges   map[string]Gauge
 }
 
 func newStandardBucket(name string) standardBucket {
@@ -34,10 +34,10 @@ func newStandardBucket(name string) standardBucket {
 	go gometrics.CaptureRuntimeMemStats(registry, RuntimeMemStatsSampleInterval)
 
 	return standardBucket{
-		name:		name,
+		name:     name,
-		registry:	registry,
+		registry: registry,
-		timers:		make(map[string]Timer),
+		timers:   make(map[string]Timer),
-		gauges:		make(map[string]Gauge),
+		gauges:   make(map[string]Gauge),
 	}
 }
 

mod/dashboard/resources/resources.go

@@ -1,12 +1,12 @@
 package resources
 
 import (
-    "bytes"
+	"bytes"
-    "compress/gzip"
+	"compress/gzip"
-    "fmt"
+	"fmt"
-    "io"
+	"io"
-    "reflect"
+	"reflect"
-    "unsafe"
+	"unsafe"
 )
 
 func bindata_read(data, name string) ([]byte, error) {
@@ -133,7 +133,6 @@ func views_stats_html() ([]byte, error) {
 	)
 }
 
-
 // Asset loads and returns the asset for the given name.
 // It returns an error if the asset could not be found or
 // could not be loaded.
@@ -145,17 +144,16 @@ func Asset(name string) ([]byte, error) {
 }
 
 // _bindata is a table, holding each asset generator, mapped to its name.
-var _bindata = map[string] func() ([]byte, error) {
+var _bindata = map[string]func() ([]byte, error){
-	"index.html": index_html,
+	"index.html":         index_html,
-	"images/add.svg": images_add_svg,
+	"images/add.svg":     images_add_svg,
-	"images/back.svg": images_back_svg,
+	"images/back.svg":    images_back_svg,
-	"images/delete.svg": images_delete_svg,
+	"images/delete.svg":  images_delete_svg,
-	"images/logo.svg": images_logo_svg,
+	"images/logo.svg":    images_logo_svg,
-	"scripts/app.js": scripts_app_js,
+	"scripts/app.js":     scripts_app_js,
 	"scripts/modules.js": scripts_modules_js,
-	"styles/styles.css": styles_styles_css,
+	"styles/styles.css":  styles_styles_css,
 	"views/browser.html": views_browser_html,
-	"views/home.html": views_home_html,
+	"views/home.html":    views_home_html,
-	"views/stats.html": views_stats_html,
+	"views/stats.html":   views_stats_html,
-
 }

mod/leader/v2/handler.go

@@ -13,19 +13,19 @@ const prefix = "/_mod/leader"
 // handler manages the leader HTTP request.
 type handler struct {
 	*mux.Router
-	client		*http.Client
+	client    *http.Client
-	transport	*http.Transport
+	transport *http.Transport
-	addr		string
+	addr      string
 }
 
 // NewHandler creates an HTTP handler that can be registered on a router.
 func NewHandler(addr string) http.Handler {
 	transport := &http.Transport{DisableKeepAlives: false}
 	h := &handler{
-		Router:		mux.NewRouter(),
+		Router:    mux.NewRouter(),
-		client:		&http.Client{Transport: transport},
+		client:    &http.Client{Transport: transport},
-		transport:	transport,
+		transport: transport,
-		addr:		addr,
+		addr:      addr,
 	}
 	h.StrictSlash(false)
 	h.handleFunc("/{key:.*}", h.getHandler).Methods("GET")

mod/lock/v2/handler.go

@@ -13,14 +13,14 @@ const prefix = "/_etcd/mod/lock"
 // handler manages the lock HTTP request.
 type handler struct {
 	*mux.Router
-	client	*etcd.Client
+	client *etcd.Client
 }
 
 // NewHandler creates an HTTP handler that can be registered on a router.
 func NewHandler(addr string) http.Handler {
 	h := &handler{
-		Router:	mux.NewRouter(),
+		Router: mux.NewRouter(),
-		client:	etcd.NewClient([]string{addr}),
+		client: etcd.NewClient([]string{addr}),
 	}
 	h.StrictSlash(false)
 	h.handleFunc("/{key:.*}", h.getIndexHandler).Methods("GET")

server/registry.go

@@ -46,7 +46,7 @@ func NewRegistry(s store.Store) *Registry {
 // Peers returns a list of cached peer names.
 func (r *Registry) Peers() []string {
 	names := make([]string, 0, len(r.peers))
-	for name, _ := range r.peers {
+	for name := range r.peers {
 		names = append(names, name)
 	}
 	sort.Sort(sort.StringSlice(names))
@@ -56,7 +56,7 @@ func (r *Registry) Peers() []string {
 // Proxies returns a list of cached proxy names.
 func (r *Registry) Proxies() []string {
 	names := make([]string, 0, len(r.proxies))
-	for name, _ := range r.proxies {
+	for name := range r.proxies {
 		names = append(names, name)
 	}
 	sort.Sort(sort.StringSlice(names))

server/v1/delete_key_handler.go

@@ -1,8 +1,9 @@
 package v1
 
 import (
-	"github.com/coreos/etcd/third_party/github.com/gorilla/mux"
 	"net/http"
+
+	"github.com/coreos/etcd/third_party/github.com/gorilla/mux"
 )
 
 // Removes a key from the store.

server/v1/v1.go

@@ -1,9 +1,10 @@
 package v1
 
 import (
+	"net/http"
+
 	"github.com/coreos/etcd/store"
 	"github.com/coreos/etcd/third_party/github.com/goraft/raft"
-	"net/http"
 )
 
 // The Server interface provides all the methods required for the v1 API.

server/v2/v2.go

@@ -1,9 +1,10 @@
 package v2
 
 import (
+	"net/http"
+
 	"github.com/coreos/etcd/store"
 	"github.com/coreos/etcd/third_party/github.com/goraft/raft"
-	"net/http"
 )
 
 // The Server interface provides all the methods required for the v2 API.

store/v2/update_command.go

@@ -1,10 +1,11 @@
 package v2
 
 import (
+	"time"
+
 	"github.com/coreos/etcd/log"
 	"github.com/coreos/etcd/store"
 	"github.com/coreos/etcd/third_party/github.com/goraft/raft"
-	"time"
 )
 
 func init() {

tests/functional/discovery_test.go

@@ -12,8 +12,8 @@ import (
 
 	"github.com/coreos/etcd/third_party/github.com/stretchr/testify/assert"
 
-	etcdtest "github.com/coreos/etcd/tests"
 	"github.com/coreos/etcd/server"
+	etcdtest "github.com/coreos/etcd/tests"
 	goetcd "github.com/coreos/etcd/third_party/github.com/coreos/go-etcd/etcd"
 )
 
@@ -294,7 +294,7 @@ func TestDiscoverySecondPeerUp(t *testing.T) {
 
 func assertServerNotUp(client http.Client, scheme string) error {
 	path := fmt.Sprintf("%s://127.0.0.1:4001/v2/keys/foo", scheme)
-	fields := url.Values(map[string][]string{"value": []string{"bar"}})
+	fields := url.Values(map[string][]string{"value": {"bar"}})
 
 	for i := 0; i < 10; i++ {
 		time.Sleep(1 * time.Second)

tests/functional/etcd_tls_test.go

@@ -145,7 +145,6 @@ func TestTLSUnauthenticatedClient(t *testing.T) {
 	}
 }
 
-
 func buildClient() http.Client {
 	return http.Client{}
 }
@@ -159,7 +158,7 @@ func startServer(extra []string) (*os.Process, error) {
 	procAttr := new(os.ProcAttr)
 	procAttr.Files = []*os.File{nil, os.Stdout, os.Stderr}
 
-	cmd := []string{"etcd",	"-f", "-data-dir=/tmp/node1", "-name=node1"}
+	cmd := []string{"etcd", "-f", "-data-dir=/tmp/node1", "-name=node1"}
 	cmd = append(cmd, extra...)
 
 	println(strings.Join(cmd, " "))
@@ -171,7 +170,7 @@ func startServerWithDataDir(extra []string) (*os.Process, error) {
 	procAttr := new(os.ProcAttr)
 	procAttr.Files = []*os.File{nil, os.Stdout, os.Stderr}
 
-	cmd := []string{"etcd",	"-data-dir=/tmp/node1", "-name=node1"}
+	cmd := []string{"etcd", "-data-dir=/tmp/node1", "-name=node1"}
 	cmd = append(cmd, extra...)
 
 	println(strings.Join(cmd, " "))
@@ -189,7 +188,7 @@ func stopServer(proc *os.Process) {
 
 func assertServerFunctional(client http.Client, scheme string) error {
 	path := fmt.Sprintf("%s://127.0.0.1:4001/v2/keys/foo", scheme)
-	fields := url.Values(map[string][]string{"value": []string{"bar"}})
+	fields := url.Values(map[string][]string{"value": {"bar"}})
 
 	for i := 0; i < 10; i++ {
 		time.Sleep(1 * time.Second)
@@ -220,7 +219,7 @@ func assertServerFunctional(client http.Client, scheme string) error {
 
 func assertServerNotFunctional(client http.Client, scheme string) error {
 	path := fmt.Sprintf("%s://127.0.0.1:4001/v2/keys/foo", scheme)
-	fields := url.Values(map[string][]string{"value": []string{"bar"}})
+	fields := url.Values(map[string][]string{"value": {"bar"}})
 
 	for i := 0; i < 10; i++ {
 		time.Sleep(1 * time.Second)

tests/functional/multi_node_kill_all_and_recovery_test.go

@@ -31,7 +31,7 @@ func TestMultiNodeKillAllAndRecovery(t *testing.T) {
 	go Monitor(clusterSize, clusterSize, leaderChan, all, stop)
 	<-all
 	<-leaderChan
-	stop <-true
+	stop <- true
 
 	c.SyncCluster()
 
@@ -102,7 +102,7 @@ func TestTLSMultiNodeKillAllAndRecovery(t *testing.T) {
 	go Monitor(clusterSize, clusterSize, leaderChan, all, stop)
 	<-all
 	<-leaderChan
-	stop <-true
+	stop <- true
 
 	c.SyncCluster()
 

tests/functional/proxy_test.go

@@ -35,7 +35,7 @@ func TestProxy(t *testing.T) {
 	time.Sleep(time.Second)
 
 	// Check that all peers and proxies have the value.
-	for i, _ := range etcds {
+	for i := range etcds {
 		resp, err := tests.Get(fmt.Sprintf("http://localhost:%d/v2/keys/foo", 4000+(i+1)))
 		if assert.NoError(t, err) {
 			body := tests.ReadBodyJSON(resp)

tests/functional/util.go

@@ -19,13 +19,14 @@ package test
 import (
 	"errors"
 	"fmt"
-	"github.com/coreos/etcd/third_party/github.com/coreos/go-etcd/etcd"
 	"io/ioutil"
 	"net"
 	"net/http"
 	"os"
 	"strconv"
 	"time"
+
+	"github.com/coreos/etcd/third_party/github.com/coreos/go-etcd/etcd"
 )
 
 var client = http.Client{
@@ -109,7 +110,7 @@ func CreateCluster(size int, procAttr *os.ProcAttr, ssl bool) ([][]string, []*os
 			}
 		} else {
 			strI := strconv.Itoa(i + 1)
-			argGroup[i] = []string{"etcd", "-name=node" + strI, fmt.Sprintf("-addr=127.0.0.1:%d", 4001 + i), fmt.Sprintf("-peer-addr=127.0.0.1:%d", 7001 + i), "-data-dir=/tmp/node" + strI, "-peers=127.0.0.1:7001"}
+			argGroup[i] = []string{"etcd", "-name=node" + strI, fmt.Sprintf("-addr=127.0.0.1:%d", 4001+i), fmt.Sprintf("-peer-addr=127.0.0.1:%d", 7001+i), "-data-dir=/tmp/node" + strI, "-peers=127.0.0.1:7001"}
 			if ssl {
 				argGroup[i] = append(argGroup[i], sslServer2...)
 			}

tests/mock/mock_store.go

@@ -1,9 +1,10 @@
 package mock
 
 import (
+	"time"
+
 	"github.com/coreos/etcd/store"
 	"github.com/stretchr/testify/mock"
-	"time"
 )
 
 // A mock Store object used for testing.