From 10e1e0e3de91eb255ecf2dad57db44b0839a2d7a Mon Sep 17 00:00:00 2001 From: John Shahid Date: Tue, 25 Mar 2014 14:22:37 -0400 Subject: [PATCH] formatting --- src/api/http/api.go | 5 +++-- src/cluster/cluster_configuration.go | 3 ++- src/coordinator/coordinator.go | 3 ++- src/integration/benchmark_test.go | 2 +- src/integration/server_test.go | 2 +- src/wal/wal.go | 5 +++-- src/wal/wal_test.go | 5 +++-- 7 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/api/http/api.go b/src/api/http/api.go index bd1e2d21c1..699896c776 100644 --- a/src/api/http/api.go +++ b/src/api/http/api.go @@ -2,7 +2,6 @@ package http import ( "cluster" - log "code.google.com/p/log4go" . "common" "coordinator" "crypto/tls" @@ -10,7 +9,6 @@ import ( "encoding/json" "errors" "fmt" - "github.com/bmizerany/pat" "io/ioutil" "net" libhttp "net/http" @@ -19,6 +17,9 @@ import ( "strconv" "strings" "time" + + log "code.google.com/p/log4go" + "github.com/bmizerany/pat" ) type HttpServer struct { diff --git a/src/cluster/cluster_configuration.go b/src/cluster/cluster_configuration.go index dd24343c94..e041a1cebc 100644 --- a/src/cluster/cluster_configuration.go +++ b/src/cluster/cluster_configuration.go @@ -2,7 +2,6 @@ package cluster import ( "bytes" - log "code.google.com/p/log4go" "common" "configuration" "crypto/sha1" @@ -18,6 +17,8 @@ import ( "sync" "time" "wal" + + log "code.google.com/p/log4go" ) // defined by cluster config (in cluster package) diff --git a/src/coordinator/coordinator.go b/src/coordinator/coordinator.go index 54bb4ca88d..219baa4f48 100644 --- a/src/coordinator/coordinator.go +++ b/src/coordinator/coordinator.go @@ -2,7 +2,6 @@ package coordinator import ( "cluster" - log "code.google.com/p/log4go" "common" "configuration" "engine" @@ -16,6 +15,8 @@ import ( "strings" "sync" "time" + + log "code.google.com/p/log4go" ) type CoordinatorImpl struct { diff --git a/src/integration/benchmark_test.go b/src/integration/benchmark_test.go index 9d14697c27..cb71e367d8 100644 --- a/src/integration/benchmark_test.go +++ b/src/integration/benchmark_test.go @@ -9,7 +9,6 @@ import ( "flag" "fmt" "io/ioutil" - . "launchpad.net/gocheck" "math/rand" "net/http" "net/url" @@ -20,6 +19,7 @@ import ( "syscall" "testing" "time" + . "launchpad.net/gocheck" ) const ( diff --git a/src/integration/server_test.go b/src/integration/server_test.go index c158dc546b..5737875518 100644 --- a/src/integration/server_test.go +++ b/src/integration/server_test.go @@ -8,7 +8,6 @@ import ( "encoding/json" "fmt" "io/ioutil" - . "launchpad.net/gocheck" "net" "net/http" "net/url" @@ -16,6 +15,7 @@ import ( "path/filepath" "syscall" "time" + . "launchpad.net/gocheck" ) type ServerSuite struct { diff --git a/src/wal/wal.go b/src/wal/wal.go index 9b82626121..13d5c427db 100644 --- a/src/wal/wal.go +++ b/src/wal/wal.go @@ -1,8 +1,6 @@ package wal import ( - "code.google.com/p/goprotobuf/proto" - logger "code.google.com/p/log4go" "configuration" "fmt" "math" @@ -11,6 +9,9 @@ import ( "protocol" "sort" "strings" + + "code.google.com/p/goprotobuf/proto" + logger "code.google.com/p/log4go" ) type WAL struct { diff --git a/src/wal/wal_test.go b/src/wal/wal_test.go index d8a6549174..81ac2f3976 100644 --- a/src/wal/wal_test.go +++ b/src/wal/wal_test.go @@ -2,10 +2,8 @@ package wal import ( . "checkers" - "code.google.com/p/goprotobuf/proto" "configuration" "fmt" - . "launchpad.net/gocheck" "math" "net/http" _ "net/http/pprof" @@ -14,6 +12,9 @@ import ( "protocol" "testing" "time" + + "code.google.com/p/goprotobuf/proto" + . "launchpad.net/gocheck" ) func Test(t *testing.T) {